Update Velopack to 0.0.915

Because even if you somehow bypass the breakage that bricks your install
by installing the missing libssl-1.0 or whatever
(https://github.com/ppy/osu/issues/30648#issuecomment-2478856055),
there's another brick upstream
(https://github.com/ppy/osu/issues/30648#issuecomment-2478926177,
https://github.com/velopack/velopack/issues/355).

Can we even downgrade like this? No idea. How does one test this? No
idea. At this point I am like a headless chicken, screaming into the
void trying to restore any semblance of order into my crumbling
universe.

If this is tried and linux is still broken with the libssl garbage, then
the `osulazer-2024.1115.1-linux-x64-*.nupkg` assets should be pulled
from the release, which should be enough to stop the game from
auto-updating. Maybe the appimage itself can stay up and people can
upgrade manually if they so desire. Or maybe not. Who knows.

.github/workflows/ci.yml

@@ -114,10 +114,7 @@ jobs:
           dotnet-version: "8.0.x"
 
       - name: Install .NET workloads
-        # since windows image 20241113.3.0, not specifying a version here
-        # installs the .NET 7 version of android workload for very unknown reasons.
-        # revisit once we upgrade to .NET 9, it's probably fixed there.
-        run: dotnet workload install android --version (dotnet --version)
+        run: dotnet workload install maui-android
 
       - name: Compile
         run: dotnet build -c Debug osu.Android.slnf

osu.Android.props

@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2024.1128.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2024.1115.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.

osu.Desktop/DiscordRichPresence.cs

@@ -15,7 +15,6 @@ using osu.Framework.Threading;
 using osu.Game;
 using osu.Game.Configuration;
 using osu.Game.Extensions;
-using osu.Game.Online;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Multiplayer;
@@ -48,9 +47,6 @@ namespace osu.Desktop
         [Resolved]
         private MultiplayerClient multiplayerClient { get; set; } = null!;
 
-        [Resolved]
-        private LocalUserStatisticsProvider statisticsProvider { get; set; } = null!;
-
         [Resolved]
         private OsuConfigManager config { get; set; } = null!;
 
@@ -121,9 +117,7 @@ namespace osu.Desktop
             status.BindValueChanged(_ => schedulePresenceUpdate());
             activity.BindValueChanged(_ => schedulePresenceUpdate());
             privacyMode.BindValueChanged(_ => schedulePresenceUpdate());
-
             multiplayerClient.RoomUpdated += onRoomUpdated;
-            statisticsProvider.StatisticsUpdated += onStatisticsUpdated;
         }
 
         private void onReady(object _, ReadyMessage __)
@@ -139,8 +133,6 @@ namespace osu.Desktop
 
         private void onRoomUpdated() => schedulePresenceUpdate();
 
-        private void onStatisticsUpdated(UserStatisticsUpdate _) => schedulePresenceUpdate();
-
         private ScheduledDelegate? presenceUpdateDelegate;
 
         private void schedulePresenceUpdate()
@@ -175,7 +167,7 @@ namespace osu.Desktop
                 presence.State = clampLength(activity.Value.GetStatus(hideIdentifiableInformation));
                 presence.Details = clampLength(activity.Value.GetDetails(hideIdentifiableInformation) ?? string.Empty);
 
-                if (activity.Value.GetBeatmapID(hideIdentifiableInformation) is int beatmapId && beatmapId > 0)
+                if (getBeatmapID(activity.Value) is int beatmapId && beatmapId > 0)
                 {
                     presence.Buttons = new[]
                     {
@@ -237,8 +229,10 @@ namespace osu.Desktop
                 presence.Assets.LargeImageText = string.Empty;
             else
             {
-                var statistics = statisticsProvider.GetStatisticsFor(ruleset.Value);
-                presence.Assets.LargeImageText = $"{user.Value.Username}" + (statistics?.GlobalRank > 0 ? $" (rank #{statistics.GlobalRank:N0})" : string.Empty);
+                if (user.Value.RulesetsStatistics != null && user.Value.RulesetsStatistics.TryGetValue(ruleset.Value.ShortName, out UserStatistics? statistics))
+                    presence.Assets.LargeImageText = $"{user.Value.Username}" + (statistics.GlobalRank > 0 ? $" (rank #{statistics.GlobalRank:N0})" : string.Empty);
+                else
+                    presence.Assets.LargeImageText = $"{user.Value.Username}" + (user.Value.Statistics?.GlobalRank > 0 ? $" (rank #{user.Value.Statistics.GlobalRank:N0})" : string.Empty);
             }
 
             // small image
@@ -333,14 +327,25 @@ namespace osu.Desktop
             return true;
         }
 
+        private static int? getBeatmapID(UserActivity activity)
+        {
+            switch (activity)
+            {
+                case UserActivity.InGame game:
+                    return game.BeatmapID;
+
+                case UserActivity.EditingBeatmap edit:
+                    return edit.BeatmapID;
+            }
+
+            return null;
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             if (multiplayerClient.IsNotNull())
                 multiplayerClient.RoomUpdated -= onRoomUpdated;
 
-            if (statisticsProvider.IsNotNull())
-                statisticsProvider.StatisticsUpdated -= onStatisticsUpdated;
-
             client.Dispose();
             base.Dispose(isDisposing);
         }

osu.Game.Benchmarks/BenchmarkUnstableRate.cs

@@ -4,54 +4,28 @@
 using System.Collections.Generic;
 using BenchmarkDotNet.Attributes;
 using osu.Framework.Utils;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Benchmarks
 {
     public class BenchmarkUnstableRate : BenchmarkTest
     {
-        private readonly List<List<HitEvent>> incrementalEventLists = new List<List<HitEvent>>();
+        private List<HitEvent> events = null!;
 
         public override void SetUp()
         {
             base.SetUp();
+            events = new List<HitEvent>();
 
-            var events = new List<HitEvent>();
-
-            for (int i = 0; i < 2048; i++)
-            {
-                // Ensure the object has hit windows populated.
-                var hitObject = new HitCircle();
-                hitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
-                events.Add(new HitEvent(RNG.NextDouble(-200.0, 200.0), RNG.NextDouble(1.0, 2.0), HitResult.Great, hitObject, null, null));
-
-                incrementalEventLists.Add(new List<HitEvent>(events));
-            }
+            for (int i = 0; i < 1000; i++)
+                events.Add(new HitEvent(RNG.NextDouble(-200.0, 200.0), RNG.NextDouble(1.0, 2.0), HitResult.Great, new HitObject(), null, null));
         }
 
         [Benchmark]
         public void CalculateUnstableRate()
         {
-            for (int i = 0; i < 2048; i++)
-            {
-                var events = incrementalEventLists[i];
-                _ = events.CalculateUnstableRate();
-            }
-        }
-
-        [Benchmark]
-        public void CalculateUnstableRateUsingIncrementalCalculation()
-        {
-            HitEventExtensions.UnstableRateCalculationResult? last = null;
-
-            for (int i = 0; i < 2048; i++)
-            {
-                var events = incrementalEventLists[i];
-                last = events.CalculateUnstableRate(last);
-            }
+            _ = events.CalculateUnstableRate();
         }
     }
 }

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

@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
                 },
                 Autoplay = true,
                 PassCondition = () => Player.ScoreProcessor.Combo.Value == 2,
-                CreateBeatmap = () => new Beatmap
+                Beatmap = new Beatmap
                 {
                     HitObjects = new List<HitObject>
                     {
@@ -59,7 +59,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
                 },
                 Autoplay = true,
                 PassCondition = () => true,
-                CreateBeatmap = () => new Beatmap
+                Beatmap = new Beatmap
                 {
                     HitObjects = new List<HitObject>
                     {
@@ -99,7 +99,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
                 },
                 Autoplay = true,
                 PassCondition = () => true,
-                CreateBeatmap = () => new Beatmap
+                Beatmap = new Beatmap
                 {
                     HitObjects = new List<HitObject>
                     {

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

@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
             Mod = new CatchModRelax(),
             Autoplay = false,
             PassCondition = passCondition,
-            CreateBeatmap = () => new Beatmap
+            Beatmap = new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {

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

@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             CreateModTest(new ModTestData
             {
-                CreateBeatmap = () => new Beatmap
+                Beatmap = new Beatmap
                 {
                     HitObjects = new List<HitObject>
                     {

osu.Game.Rulesets.Catch/Edit/CatchDistanceSnapProvider.cs

@@ -10,7 +10,7 @@ namespace osu.Game.Rulesets.Catch.Edit
 {
     public partial class CatchDistanceSnapProvider : ComposerDistanceSnapProvider
     {
-        public override double ReadCurrentDistanceSnap(HitObject before, HitObject after)
+        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.

osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs

@@ -70,8 +70,6 @@ namespace osu.Game.Rulesets.Catch.Edit
             }));
         }
 
-        protected override Drawable CreateHitObjectInspector() => new CatchHitObjectInspector(DistanceSnapProvider);
-
         protected override IEnumerable<TernaryButton> CreateTernaryButtons()
             => base.CreateTernaryButtons()
                    .Concat(DistanceSnapProvider.CreateTernaryButtons());

osu.Game.Rulesets.Catch/Edit/CatchHitObjectInspector.cs

@@ -1,41 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System.Linq;
-using osu.Game.Rulesets.Catch.Objects;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Screens.Edit.Compose.Components;
-
-namespace osu.Game.Rulesets.Catch.Edit
-{
-    public partial class CatchHitObjectInspector(CatchDistanceSnapProvider snapProvider) : HitObjectInspector
-    {
-        protected override void AddInspectorValues(HitObject[] objects)
-        {
-            base.AddInspectorValues(objects);
-
-            if (objects.Length > 0)
-            {
-                HitObject firstSelectedHitObject = objects.MinBy(ho => ho.StartTime)!;
-                HitObject lastSelectedHitObject = objects.MaxBy(ho => ho.GetEndTime())!;
-
-                HitObject? precedingObject = EditorBeatmap.HitObjects.LastOrDefault(ho => ho.GetEndTime() < firstSelectedHitObject.StartTime);
-                HitObject? nextObject = EditorBeatmap.HitObjects.FirstOrDefault(ho => ho.StartTime > lastSelectedHitObject.GetEndTime());
-
-                if (precedingObject != null && precedingObject is not BananaShower)
-                {
-                    double previousSnap = snapProvider.ReadCurrentDistanceSnap(precedingObject, firstSelectedHitObject);
-                    AddHeader("To previous");
-                    AddValue($"{previousSnap:#,0.##}x");
-                }
-
-                if (nextObject != null && nextObject is not BananaShower)
-                {
-                    double nextSnap = snapProvider.ReadCurrentDistanceSnap(lastSelectedHitObject, nextObject);
-                    AddHeader("To next");
-                    AddValue($"{nextSnap:#,0.##}x");
-                }
-            }
-        }
-    }
-}

osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaSelectionHandler.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Mania.Edit.Blueprints;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Screens.Edit.Compose.Components;
@@ -107,7 +106,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             AddStep("select everything", () => EditorBeatmap.SelectedHitObjects.AddRange(EditorBeatmap.HitObjects));
             AddStep("start drag", () =>
             {
-                InputManager.MoveMouseTo(this.ChildrenOfType<NoteSelectionBlueprint>().Single(blueprint => blueprint.IsSelected && blueprint.HitObject.StartTime == 0));
+                InputManager.MoveMouseTo(this.ChildrenOfType<Column>().First());
                 InputManager.PressButton(MouseButton.Left);
             });
             AddStep("end drag", () =>

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

@@ -1,39 +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 NUnit.Framework;
-using osu.Game.Rulesets.Mania.Scoring;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Scoring;
-
-namespace osu.Game.Rulesets.Mania.Tests
-{
-    [TestFixture]
-    public class ManiaScoreProcessorTest
-    {
-        [TestCase(ScoreRank.X, 1, HitResult.Perfect)]
-        [TestCase(ScoreRank.X, 0.99, HitResult.Great)]
-        [TestCase(ScoreRank.D, 0.1, HitResult.Great)]
-        [TestCase(ScoreRank.X, 0.99, HitResult.Perfect, HitResult.Great)]
-        [TestCase(ScoreRank.X, 0.99, HitResult.Great, HitResult.Great)]
-        [TestCase(ScoreRank.S, 0.99, HitResult.Perfect, HitResult.Good)]
-        [TestCase(ScoreRank.S, 0.99, HitResult.Perfect, HitResult.Ok)]
-        [TestCase(ScoreRank.S, 0.99, HitResult.Perfect, HitResult.Meh)]
-        [TestCase(ScoreRank.S, 0.99, HitResult.Perfect, HitResult.Miss)]
-        [TestCase(ScoreRank.S, 0.99, HitResult.Great, HitResult.Good)]
-        [TestCase(ScoreRank.S, 0.99, HitResult.Great, HitResult.Ok)]
-        [TestCase(ScoreRank.S, 0.99, HitResult.Great, HitResult.Meh)]
-        [TestCase(ScoreRank.S, 0.99, HitResult.Great, HitResult.Miss)]
-        public void TestRanks(ScoreRank expected, double accuracy, params HitResult[] results)
-        {
-            var scoreProcessor = new ManiaScoreProcessor();
-
-            Dictionary<HitResult, int> resultsDict = new Dictionary<HitResult, int>();
-            foreach (var result in results)
-                resultsDict[result] = resultsDict.GetValueOrDefault(result) + 1;
-
-            Assert.That(scoreProcessor.RankFromScore(accuracy, resultsDict), Is.EqualTo(expected));
-        }
-    }
-}

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

@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
             CreateModTest(new ModTestData
             {
                 Autoplay = true,
-                CreateBeatmap = () => new ManiaBeatmap(new StageDefinition(1))
+                Beatmap = new ManiaBeatmap(new StageDefinition(1))
                 {
                     HitObjects = new List<ManiaHitObject>
                     {

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

@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
                                   && Precision.AlmostEquals(Player.ScoreProcessor.Accuracy.Value, 0.9836, 0.01)
                                   && Player.ScoreProcessor.TotalScore.Value == 946_049,
             Autoplay = false,
-            CreateBeatmap = () => new Beatmap
+            Beatmap = new Beatmap
             {
                 BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo },
                 Difficulty = { OverallDifficulty = 10 },
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
                                       && Player.ScoreProcessor.Accuracy.Value == 1
                                       && Player.ScoreProcessor.TotalScore.Value == (long)(1_000_000 * doubleTime.ScoreMultiplier),
                 Autoplay = false,
-                CreateBeatmap = () => new Beatmap
+                Beatmap = new Beatmap
                 {
                     BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo },
                     Difficulty = { OverallDifficulty = 10 },

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

@@ -74,7 +74,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
             CreateModTest(new ModTestData
             {
                 Mod = new ManiaModHidden(),
-                CreateBeatmap = () => new Beatmap
+                Beatmap = new Beatmap
                 {
                     HitObjects = Enumerable.Range(1, 100).Select(i => (HitObject)new Note { StartTime = 1000 + 200 * i }).ToList(),
                     Breaks = { new BreakPeriod(2000, 28000) }

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

@@ -74,7 +74,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
             CreateModTest(new ModTestData
             {
                 Mod = new ManiaModHidden(),
-                CreateBeatmap = () => new Beatmap
+                Beatmap = new Beatmap
                 {
                     HitObjects = Enumerable.Range(1, 100).Select(i => (HitObject)new Note { StartTime = 1000 + 200 * i }).ToList(),
                     Breaks = { new BreakPeriod(2000, 28000) }

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

@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
             Mod = new ManiaModPerfect(),
             PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(false),
             Autoplay = false,
-            CreateBeatmap = () => new Beatmap
+            Beatmap = new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -59,7 +59,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
             Mod = new ManiaModPerfect(),
             PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(true) && Player.Results.Count == 2,
             Autoplay = false,
-            CreateBeatmap = () => new Beatmap
+            Beatmap = new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {

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

@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
             Mod = new ManiaModSuddenDeath(),
             PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(false),
             Autoplay = false,
-            CreateBeatmap = () => new Beatmap
+            Beatmap = new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
             Mod = new ManiaModSuddenDeath(),
             PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(true) && Player.Results.Count == 2,
             Autoplay = false,
-            CreateBeatmap = () => new Beatmap
+            Beatmap = new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {

osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs

@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Mania.Configuration
         {
             base.InitialiseDefaults();
 
-            SetDefault(ManiaRulesetSetting.ScrollSpeed, 8.0, 1.0, 40.0, 0.1);
+            SetDefault(ManiaRulesetSetting.ScrollSpeed, 8, 1, 40);
             SetDefault(ManiaRulesetSetting.ScrollDirection, ManiaScrollingDirection.Down);
             SetDefault(ManiaRulesetSetting.TimingBasedNoteColouring, false);
 
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Mania.Configuration
 
             if (Get<double?>(ManiaRulesetSetting.ScrollTime) is double scrollTime)
             {
-                SetValue(ManiaRulesetSetting.ScrollSpeed, Math.Round(DrawableManiaRuleset.MAX_TIME_RANGE / scrollTime));
+                SetValue(ManiaRulesetSetting.ScrollSpeed, (int)Math.Round(DrawableManiaRuleset.MAX_TIME_RANGE / scrollTime));
                 SetValue<double?>(ManiaRulesetSetting.ScrollTime, null);
             }
 #pragma warning restore CS0618
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Mania.Configuration
 
         public override TrackedSettings CreateTrackedSettings() => new TrackedSettings
         {
-            new TrackedSetting<double>(ManiaRulesetSetting.ScrollSpeed,
+            new TrackedSetting<int>(ManiaRulesetSetting.ScrollSpeed,
                 speed => new SettingDescription(
                     rawValue: speed,
                     name: RulesetSettingsStrings.ScrollSpeed,

osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs

@@ -5,7 +5,6 @@ using System;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
-using osu.Game.Rulesets.Difficulty.Utils;
 using osu.Game.Rulesets.Mania.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Mods;
 
@@ -74,7 +73,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty.Skills
             // 0.0 +--------+-+---------------> Release Difference / ms
             //         release_threshold
             if (isOverlapping)
-                holdAddition = DifficultyCalculationUtils.Logistic(x: closestEndTime, multiplier: 0.27, midpointOffset: release_threshold);
+                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);

osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditBodyPiece.cs

@@ -3,39 +3,21 @@
 
 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.Rulesets.Mania.Skinning.Default;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints.Components
 {
-    public partial class EditBodyPiece : CompositeDrawable
+    public partial class EditBodyPiece : DefaultBodyPiece
     {
-        private readonly Container border;
-
-        public EditBodyPiece()
-        {
-            InternalChildren = new Drawable[]
-            {
-                border = new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    BorderThickness = 3,
-                    Child = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Alpha = 0,
-                        AlwaysPresent = true,
-                    },
-                },
-            };
-        }
-
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            border.BorderColour = colours.YellowDarker;
+            AccentColour.Value = colours.Yellow;
+
+            Background.Alpha = 0.5f;
         }
+
+        protected override Drawable CreateForeground() => base.CreateForeground().With(d => d.Alpha = 0);
     }
 }

osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditHoldNoteEndPiece.cs

@@ -4,7 +4,6 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
@@ -27,11 +26,10 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints.Components
         {
             Height = DefaultNotePiece.NOTE_HEIGHT;
 
-            InternalChild = new EditNotePiece
-            {
-                RelativeSizeAxes = Axes.Both,
-                Height = 1,
-            };
+            CornerRadius = 5;
+            Masking = true;
+
+            InternalChild = new DefaultNotePiece();
         }
 
         protected override void LoadComplete()
@@ -62,23 +60,19 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints.Components
         {
             base.OnDrag(e);
             Dragging?.Invoke(e.ScreenSpaceMousePosition);
-            updateState();
         }
 
         protected override void OnDragEnd(DragEndEvent e)
         {
             base.OnDragEnd(e);
             DragEnded?.Invoke();
-            updateState();
         }
 
         private void updateState()
         {
-            InternalChild.Colour = Colour4.White;
-
             var colour = colours.Yellow;
 
-            if (IsHovered || IsDragged)
+            if (IsHovered)
                 colour = colour.Lighten(1);
 
             Colour = colour;

osu.Game.Rulesets.Mania/Edit/Blueprints/Components/EditNotePiece.cs

@@ -2,63 +2,28 @@
 // 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.Graphics;
-using osu.Game.Rulesets.Mania.UI;
-using osu.Game.Rulesets.UI.Scrolling;
-using osuTK;
+using osu.Game.Rulesets.Mania.Skinning.Default;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints.Components
 {
     public partial class EditNotePiece : CompositeDrawable
     {
-        private readonly Container border;
-        private readonly Box box;
-
-        [Resolved]
-        private Column? column { get; set; }
-
         public EditNotePiece()
         {
-            InternalChildren = new Drawable[]
-            {
-                border = new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    BorderThickness = 3,
-                    Child = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Alpha = 0,
-                        AlwaysPresent = true,
-                    },
-                },
-                box = new Box
-                {
-                    RelativeSizeAxes = Axes.X,
-                    Height = 3,
-                    Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.BottomCentre,
-                },
-            };
+            Height = DefaultNotePiece.NOTE_HEIGHT;
+
+            CornerRadius = 5;
+            Masking = true;
+
+            InternalChild = new DefaultNotePiece();
         }
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            border.BorderColour = colours.YellowDark;
-            box.Colour = colours.YellowLight;
-        }
-
-        protected override void Update()
-        {
-            base.Update();
-
-            if (column != null)
-                Scale = new Vector2(1, column.ScrollingInfo.Direction.Value == ScrollingDirection.Down ? 1 : -1);
+            Colour = colours.Yellow;
         }
     }
 }

osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs

@@ -4,10 +4,8 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
-using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
@@ -19,9 +17,9 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 {
     public partial class HoldNotePlacementBlueprint : ManiaPlacementBlueprint<HoldNote>
     {
-        private EditBodyPiece bodyPiece = null!;
-        private Circle headPiece = null!;
-        private Circle tailPiece = null!;
+        private readonly EditBodyPiece bodyPiece;
+        private readonly EditNotePiece headPiece;
+        private readonly EditNotePiece tailPiece;
 
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; } = null!;
@@ -30,29 +28,14 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
         public HoldNotePlacementBlueprint()
             : base(new HoldNote())
-        {
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
         {
             RelativeSizeAxes = Axes.Both;
 
             InternalChildren = new Drawable[]
             {
                 bodyPiece = new EditBodyPiece { Origin = Anchor.TopCentre },
-                headPiece = new Circle
-                {
-                    Origin = Anchor.Centre,
-                    Colour = colours.Yellow,
-                    Height = 10
-                },
-                tailPiece = new Circle
-                {
-                    Origin = Anchor.Centre,
-                    Colour = colours.Yellow,
-                    Height = 10
-                },
+                headPiece = new EditNotePiece { Origin = Anchor.Centre },
+                tailPiece = new EditNotePiece { Origin = Anchor.Centre }
             };
         }
 

osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs

@@ -2,14 +2,14 @@
 // 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.Primitives;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.Mania.Objects.Drawables;
-using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit;
 using osuTK;
 
@@ -17,6 +17,9 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 {
     public partial class HoldNoteSelectionBlueprint : ManiaSelectionBlueprint<HoldNote>
     {
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
         [Resolved]
         private IEditorChangeHandler? changeHandler { get; set; }
 
@@ -26,12 +29,9 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         [Resolved]
         private IPositionSnapProvider? positionSnapProvider { get; set; }
 
-        private EditBodyPiece body = null!;
         private EditHoldNoteEndPiece head = null!;
         private EditHoldNoteEndPiece tail = null!;
 
-        protected new DrawableHoldNote DrawableObject => (DrawableHoldNote)base.DrawableObject;
-
         public HoldNoteSelectionBlueprint(HoldNote hold)
             : base(hold)
         {
@@ -42,17 +42,9 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         {
             InternalChildren = new Drawable[]
             {
-                body = new EditBodyPiece
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.BottomCentre,
-                },
                 head = new EditHoldNoteEndPiece
                 {
                     RelativeSizeAxes = Axes.X,
-                    Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.BottomCentre,
                     DragStarted = () => changeHandler?.BeginChange(),
                     Dragging = pos =>
                     {
@@ -72,8 +64,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
                 tail = new EditHoldNoteEndPiece
                 {
                     RelativeSizeAxes = Axes.X,
-                    Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.BottomCentre,
                     DragStarted = () => changeHandler?.BeginChange(),
                     Dragging = pos =>
                     {
@@ -89,6 +79,19 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
                     },
                     DragEnded = () => changeHandler?.EndChange(),
                 },
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    BorderThickness = 1,
+                    BorderColour = colours.Yellow,
+                    Child = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Alpha = 0,
+                        AlwaysPresent = true,
+                    }
+                }
             };
         }
 
@@ -96,23 +99,11 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         {
             base.Update();
 
-            head.Height = DrawableObject.Head.DrawHeight;
             head.Y = HitObjectContainer.PositionAtTime(HitObject.Head.StartTime, HitObject.StartTime);
-            tail.Height = DrawableObject.Tail.DrawHeight;
             tail.Y = HitObjectContainer.PositionAtTime(HitObject.Tail.StartTime, HitObject.StartTime);
             Height = HitObjectContainer.LengthAtTime(HitObject.StartTime, HitObject.EndTime) + tail.DrawHeight;
         }
 
-        protected override void OnDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
-        {
-            Origin = direction.NewValue == ScrollingDirection.Down ? Anchor.BottomCentre : Anchor.TopCentre;
-
-            foreach (var child in InternalChildren)
-                child.Anchor = Origin;
-
-            head.Scale = tail.Scale = body.Scale = new Vector2(1, direction.NewValue == ScrollingDirection.Down ? 1 : -1);
-        }
-
         public override Quad SelectionQuad => ScreenSpaceDrawQuad;
 
         public override Vector2 ScreenSpaceSelectionPoint => head.ScreenSpaceDrawQuad.Centre;

osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs

@@ -37,10 +37,16 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            directionBindable.BindValueChanged(OnDirectionChanged, true);
+            directionBindable.BindValueChanged(onDirectionChanged, true);
         }
 
-        protected abstract void OnDirectionChanged(ValueChangedEvent<ScrollingDirection> direction);
+        private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
+        {
+            var anchor = direction.NewValue == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre;
+            Anchor = Origin = anchor;
+            foreach (var child in InternalChildren)
+                child.Anchor = child.Origin = anchor;
+        }
 
         protected override void Update()
         {

osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs

@@ -1,12 +1,10 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
-using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
 using osuTK.Input;
 
@@ -14,25 +12,14 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 {
     public partial class NotePlacementBlueprint : ManiaPlacementBlueprint<Note>
     {
-        private Circle piece = null!;
+        private readonly EditNotePiece piece;
 
         public NotePlacementBlueprint()
             : base(new Note())
-        {
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
         {
             RelativeSizeAxes = Axes.Both;
-            Masking = true;
 
-            InternalChild = piece = new Circle
-            {
-                Origin = Anchor.Centre,
-                Colour = colours.Yellow,
-                Height = 10
-            };
+            InternalChild = piece = new EditNotePiece { Origin = Anchor.Centre };
         }
 
         public override void UpdateTimeAndPosition(SnapResult result)

osu.Game.Rulesets.Mania/Edit/Blueprints/NoteSelectionBlueprint.cs

@@ -1,42 +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.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.UI.Scrolling;
-using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 {
     public partial class NoteSelectionBlueprint : ManiaSelectionBlueprint<Note>
     {
-        private readonly EditNotePiece notePiece;
-
         public NoteSelectionBlueprint(Note note)
             : base(note)
         {
-            Anchor = Anchor.BottomCentre;
-            Origin = Anchor.BottomCentre;
-            AddInternal(notePiece = new EditNotePiece
-            {
-                RelativeSizeAxes = Axes.X,
-                Anchor = Anchor.BottomCentre,
-                Origin = Anchor.BottomCentre,
-            });
-        }
-
-        protected override void Update()
-        {
-            base.Update();
-
-            notePiece.Height = DrawableObject.DrawHeight;
-        }
-
-        protected override void OnDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
-        {
-            notePiece.Scale = new Vector2(1, direction.NewValue == ScrollingDirection.Down ? 1 : -1);
+            AddInternal(new EditNotePiece { RelativeSizeAxes = Axes.X });
         }
     }
 }

osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs

@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         protected override void Update()
         {
-            TargetTimeRange = TimelineTimeRange == null || ShowSpeedChanges.Value ? ComputeScrollTime(Config.Get<double>(ManiaRulesetSetting.ScrollSpeed)) : TimelineTimeRange.Value;
+            TargetTimeRange = TimelineTimeRange == null || ShowSpeedChanges.Value ? ComputeScrollTime(Config.Get<int>(ManiaRulesetSetting.ScrollSpeed)) : TimelineTimeRange.Value;
             base.Update();
         }
     }

osu.Game.Rulesets.Mania/Edit/EditorColumn.cs

@@ -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.Game.Rulesets.Mania.Objects.Drawables;
-using osu.Game.Rulesets.Mania.UI;
-using osu.Game.Rulesets.Objects.Drawables;
-
-namespace osu.Game.Rulesets.Mania.Edit
-{
-    public partial class EditorColumn : Column
-    {
-        public EditorColumn(int index, bool isSpecial)
-            : base(index, isSpecial)
-        {
-        }
-
-        protected override void OnNewDrawableHitObject(DrawableHitObject drawableHitObject)
-        {
-            base.OnNewDrawableHitObject(drawableHitObject);
-            drawableHitObject.ApplyCustomUpdateState += (dho, state) =>
-            {
-                switch (dho)
-                {
-                    // hold note heads are exempt from what follows due to the "freezing" mechanic
-                    // which already ensures they'll never fade away on their own.
-                    case DrawableHoldNoteHead:
-                        break;
-
-                    // mania features instantaneous hitobject fade-outs.
-                    // this means that without manual intervention stopping the clock at the precise time of hitting the object
-                    // means the object will fade out.
-                    // this is anti-user in editor contexts, as the user is expecting to continue the see the note on the receptor line.
-                    // therefore, apply a crude workaround to prevent it from going away.
-                    default:
-                    {
-                        if (state == ArmedState.Hit)
-                            dho.FadeTo(1).Delay(1).FadeOut().Expire();
-                        break;
-                    }
-                }
-            };
-        }
-    }
-}

osu.Game.Rulesets.Mania/Edit/EditorStage.cs

@@ -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.Game.Rulesets.Mania.Beatmaps;
-using osu.Game.Rulesets.Mania.UI;
-
-namespace osu.Game.Rulesets.Mania.Edit
-{
-    public partial class EditorStage : Stage
-    {
-        public EditorStage(int firstColumnIndex, StageDefinition definition, ref ManiaAction columnStartAction)
-            : base(firstColumnIndex, definition, ref columnStartAction)
-        {
-        }
-
-        protected override Column CreateColumn(int index, bool isSpecial) => new EditorColumn(index, isSpecial);
-    }
-}

osu.Game.Rulesets.Mania/Edit/ManiaEditorPlayfield.cs

@@ -13,8 +13,5 @@ namespace osu.Game.Rulesets.Mania.Edit
             : base(stages)
         {
         }
-
-        protected override Stage CreateStage(int firstColumnIndex, StageDefinition stageDefinition, ref ManiaAction columnAction)
-            => new EditorStage(firstColumnIndex, stageDefinition, ref columnAction);
     }
 }

osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs

@@ -92,7 +92,7 @@ namespace osu.Game.Rulesets.Mania.Edit
             base.Update();
 
             if (screenWithTimeline?.TimelineArea.Timeline != null)
-                drawableRuleset.TimelineTimeRange = EditorClock.TrackLength / screenWithTimeline.TimelineArea.Timeline.CurrentZoom.Value / 2;
+                drawableRuleset.TimelineTimeRange = EditorClock.TrackLength / screenWithTimeline.TimelineArea.Timeline.CurrentZoom / 2;
         }
     }
 }

osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs

@@ -33,11 +33,11 @@ namespace osu.Game.Rulesets.Mania
                     LabelText = RulesetSettingsStrings.ScrollingDirection,
                     Current = config.GetBindable<ManiaScrollingDirection>(ManiaRulesetSetting.ScrollDirection)
                 },
-                new SettingsSlider<double, ManiaScrollSlider>
+                new SettingsSlider<int, ManiaScrollSlider>
                 {
                     LabelText = RulesetSettingsStrings.ScrollSpeed,
-                    Current = config.GetBindable<double>(ManiaRulesetSetting.ScrollSpeed),
-                    KeyboardStep = 1
+                    Current = config.GetBindable<int>(ManiaRulesetSetting.ScrollSpeed),
+                    KeyboardStep = 5
                 },
                 new SettingsCheckbox
                 {
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Mania
             };
         }
 
-        private partial class ManiaScrollSlider : RoundedSliderBar<double>
+        private partial class ManiaScrollSlider : RoundedSliderBar<int>
         {
             public override LocalisableString TooltipText => RulesetSettingsStrings.ScrollSpeedTooltip((int)DrawableManiaRuleset.ComputeScrollTime(Current.Value), Current.Value);
         }

osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs

@@ -9,7 +9,6 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Scoring
 {
@@ -59,24 +58,6 @@ namespace osu.Game.Rulesets.Mania.Scoring
             return GetBaseScoreForResult(result);
         }
 
-        public override ScoreRank RankFromScore(double accuracy, IReadOnlyDictionary<HitResult, int> results)
-        {
-            ScoreRank rank = base.RankFromScore(accuracy, results);
-
-            if (rank != ScoreRank.S)
-                return rank;
-
-            // SS is expected as long as all hitobjects have been hit with either a GREAT or PERFECT result.
-
-            bool anyImperfect =
-                results.GetValueOrDefault(HitResult.Good) > 0
-                || results.GetValueOrDefault(HitResult.Ok) > 0
-                || results.GetValueOrDefault(HitResult.Meh) > 0
-                || results.GetValueOrDefault(HitResult.Miss) > 0;
-
-            return anyImperfect ? rank : ScoreRank.X;
-        }
-
         private class JudgementOrderComparer : IComparer<HitObject>
         {
             public static readonly JudgementOrderComparer DEFAULT = new JudgementOrderComparer();

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

@@ -54,8 +54,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
                 },
                 columnBackgrounds = new ColumnFlow<Drawable>(stageDefinition)
                 {
-                    RelativeSizeAxes = Axes.Y,
-                    Masking = false,
+                    RelativeSizeAxes = Axes.Y
                 },
                 new HitTargetInsetContainer
                 {
@@ -127,8 +126,8 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
                             },
                             new Container
                             {
-                                X = isLastColumn ? -0.16f : 0,
                                 Anchor = Anchor.TopRight,
+                                Origin = Anchor.TopRight,
                                 RelativeSizeAxes = Axes.Y,
                                 Width = rightLineWidth,
                                 Scale = new Vector2(0.740f, 1),

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

@@ -164,10 +164,10 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 
         private Drawable getResult(HitResult result)
         {
-            if (!hit_result_mapping.TryGetValue(result, out var value))
+            if (!hit_result_mapping.ContainsKey(result))
                 return null;
 
-            string filename = this.GetManiaSkinConfig<string>(value)?.Value
+            string filename = this.GetManiaSkinConfig<string>(hit_result_mapping[result])?.Value
                               ?? default_hit_result_skin_filenames[result];
 
             var animation = this.GetAnimation(filename, true, true, frameLength: 1000 / 20d);

osu.Game.Rulesets.Mania/UI/ColumnFlow.cs

@@ -28,12 +28,6 @@ namespace osu.Game.Rulesets.Mania.UI
         private readonly FillFlowContainer<Container<TContent>> columns;
         private readonly StageDefinition stageDefinition;
 
-        public new bool Masking
-        {
-            get => base.Masking;
-            set => base.Masking = value;
-        }
-
         public ColumnFlow(StageDefinition stageDefinition)
         {
             this.stageDefinition = stageDefinition;

osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs

@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Mania.UI
         protected new ManiaRulesetConfigManager Config => (ManiaRulesetConfigManager)base.Config;
 
         private readonly Bindable<ManiaScrollingDirection> configDirection = new Bindable<ManiaScrollingDirection>();
-        private readonly BindableDouble configScrollSpeed = new BindableDouble();
+        private readonly BindableInt configScrollSpeed = new BindableInt();
 
         private double currentTimeRange;
         protected double TargetTimeRange;
@@ -160,7 +160,7 @@ namespace osu.Game.Rulesets.Mania.UI
         /// </summary>
         /// <param name="scrollSpeed">The scroll speed.</param>
         /// <returns>The scroll time.</returns>
-        public static double ComputeScrollTime(double scrollSpeed) => MAX_TIME_RANGE / scrollSpeed;
+        public static double ComputeScrollTime(int scrollSpeed) => MAX_TIME_RANGE / scrollSpeed;
 
         public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new ManiaPlayfieldAdjustmentContainer();
 

osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs

@@ -7,7 +7,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using System;
 using System.Collections.Generic;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Primitives;
 using osu.Game.Rulesets.Mania.Beatmaps;
@@ -72,7 +71,7 @@ namespace osu.Game.Rulesets.Mania.UI
 
             for (int i = 0; i < stageDefinitions.Count; i++)
             {
-                var newStage = CreateStage(firstColumnIndex, stageDefinitions[i], ref columnAction);
+                var newStage = new Stage(firstColumnIndex, stageDefinitions[i], ref columnAction);
 
                 playfieldGrid.Content[0][i] = newStage;
 
@@ -83,9 +82,6 @@ namespace osu.Game.Rulesets.Mania.UI
             }
         }
 
-        [Pure]
-        protected virtual Stage CreateStage(int firstColumnIndex, StageDefinition stageDefinition, ref ManiaAction columnAction) => new Stage(firstColumnIndex, stageDefinition, ref columnAction);
-
         public override void Add(HitObject hitObject) => getStageByColumn(((ManiaHitObject)hitObject).Column).Add(hitObject);
 
         public override bool Remove(HitObject hitObject) => getStageByColumn(((ManiaHitObject)hitObject).Column).Remove(hitObject);

osu.Game.Rulesets.Mania/UI/Stage.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
@@ -135,14 +134,12 @@ namespace osu.Game.Rulesets.Mania.UI
             {
                 bool isSpecial = definition.IsSpecialColumn(i);
 
-                var action = columnStartAction;
-                columnStartAction++;
-                var column = CreateColumn(firstColumnIndex + i, isSpecial).With(c =>
+                var column = new Column(firstColumnIndex + i, isSpecial)
                 {
-                    c.RelativeSizeAxes = Axes.Both;
-                    c.Width = 1;
-                    c.Action.Value = action;
-                });
+                    RelativeSizeAxes = Axes.Both,
+                    Width = 1,
+                    Action = { Value = columnStartAction++ }
+                };
 
                 topLevelContainer.Add(column.TopLevelContainer.CreateProxy());
                 columnBackgrounds.Add(column.BackgroundContainer.CreateProxy());
@@ -157,9 +154,6 @@ namespace osu.Game.Rulesets.Mania.UI
             RegisterPool<BarLine, DrawableBarLine>(50, 200);
         }
 
-        [Pure]
-        protected virtual Column CreateColumn(int index, bool isSpecial) => new Column(index, isSpecial);
-
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin)
         {

osu.Game.Rulesets.Osu.Tests.iOS/osu.Game.Rulesets.Osu.Tests.iOS.csproj

@@ -17,8 +17,4 @@
     <ProjectReference Include="..\osu.Game\osu.Game.csproj" />
     <ProjectReference Include="..\osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj" />
   </ItemGroup>
-  <ItemGroup Label="Package References">
-    <PackageReference Include="DeepEqual" Version="2.0.0" />
-    <PackageReference Include="Moq" Version="4.17.2" />
-  </ItemGroup>
 </Project>

osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderDrawing.cs

@@ -8,7 +8,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Edit.Components.RadioButtons;
@@ -25,57 +24,38 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(ruleset, false);
 
         [Test]
-        public void TestTouchInputPlaceHitCircleDirectly()
-        {
-            AddStep("tap circle", () => tap(this.ChildrenOfType<EditorRadioButton>().Single(b => b.Button.Label == "HitCircle")));
-
-            AddStep("tap to place circle", () => tap(this.ChildrenOfType<Playfield>().Single()));
-            AddAssert("circle placed correctly", () =>
-            {
-                var circle = (HitCircle)EditorBeatmap.HitObjects.Single(h => h.StartTime == EditorClock.CurrentTimeAccurate);
-                Assert.Multiple(() =>
-                {
-                    Assert.That(circle.Position.X, Is.EqualTo(256f).Within(0.01f));
-                    Assert.That(circle.Position.Y, Is.EqualTo(192f).Within(0.01f));
-                });
-
-                return true;
-            });
-        }
-
-        [Test]
-        public void TestTouchInputPlaceCircleAfterTouchingComposeArea()
+        public void TestTouchInputAfterTouchingComposeArea()
         {
             AddStep("tap circle", () => tap(this.ChildrenOfType<EditorRadioButton>().Single(b => b.Button.Label == "HitCircle")));
 
+            // this input is just for interacting with compose area
             AddStep("tap playfield", () => tap(this.ChildrenOfType<Playfield>().Single()));
-            AddAssert("circle placed", () => EditorBeatmap.HitObjects.Single(h => h.StartTime == EditorClock.CurrentTimeAccurate) is HitCircle);
 
-            AddStep("move forward", () => InputManager.Key(Key.Right));
+            AddStep("move current time", () => InputManager.Key(Key.Right));
 
-            AddStep("tap to place circle", () => tap(this.ChildrenOfType<Playfield>().Single()));
+            AddStep("tap to place circle", () => tap(this.ChildrenOfType<Playfield>().Single().ToScreenSpace(new Vector2(10, 10))));
             AddAssert("circle placed correctly", () =>
             {
                 var circle = (HitCircle)EditorBeatmap.HitObjects.Single(h => h.StartTime == EditorClock.CurrentTimeAccurate);
                 Assert.Multiple(() =>
                 {
-                    Assert.That(circle.Position.X, Is.EqualTo(256f).Within(0.01f));
-                    Assert.That(circle.Position.Y, Is.EqualTo(192f).Within(0.01f));
+                    Assert.That(circle.Position.X, Is.EqualTo(10f).Within(0.01f));
+                    Assert.That(circle.Position.Y, Is.EqualTo(10f).Within(0.01f));
                 });
 
                 return true;
             });
-        }
 
-        [Test]
-        public void TestTouchInputPlaceSliderDirectly()
-        {
             AddStep("tap slider", () => tap(this.ChildrenOfType<EditorRadioButton>().Single(b => b.Button.Label == "Slider")));
 
+            // this input is just for interacting with compose area
+            AddStep("tap playfield", () => tap(this.ChildrenOfType<Playfield>().Single()));
+
+            AddStep("move current time", () => InputManager.Key(Key.Right));
+
             AddStep("hold to draw slider", () => InputManager.BeginTouch(new Touch(TouchSource.Touch1, this.ChildrenOfType<Playfield>().Single().ToScreenSpace(new Vector2(50, 20)))));
             AddStep("drag to draw", () => InputManager.MoveTouchTo(new Touch(TouchSource.Touch1, this.ChildrenOfType<Playfield>().Single().ToScreenSpace(new Vector2(200, 50)))));
             AddAssert("selection not initiated", () => this.ChildrenOfType<DragBox>().All(d => d.State == Visibility.Hidden));
-            AddAssert("blueprint visible", () => this.ChildrenOfType<SliderPlacementBlueprint>().Single().Alpha > 0);
             AddStep("end", () => InputManager.EndTouch(new Touch(TouchSource.Touch1, InputManager.CurrentState.Touch.GetTouchPosition(TouchSource.Touch1)!.Value)));
             AddAssert("slider placed correctly", () =>
             {
@@ -96,55 +76,12 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             });
         }
 
-        [Test]
-        public void TestTouchInputPlaceSliderAfterTouchingComposeArea()
-        {
-            AddStep("tap slider", () => tap(this.ChildrenOfType<EditorRadioButton>().Single(b => b.Button.Label == "Slider")));
-
-            AddStep("tap playfield", () => tap(this.ChildrenOfType<Playfield>().Single()));
-            AddStep("tap and hold another spot", () => hold(this.ChildrenOfType<Playfield>().Single(), new Vector2(50, 0)));
-            AddUntilStep("wait for slider placement", () => EditorBeatmap.HitObjects.SingleOrDefault(h => h.StartTime == EditorClock.CurrentTimeAccurate) is Slider);
-            AddStep("end", () => InputManager.EndTouch(new Touch(TouchSource.Touch1, InputManager.CurrentState.Touch.GetTouchPosition(TouchSource.Touch1)!.Value)));
-
-            AddStep("move forward", () => InputManager.Key(Key.Right));
-
-            AddStep("hold to draw slider", () => InputManager.BeginTouch(new Touch(TouchSource.Touch1, this.ChildrenOfType<Playfield>().Single().ToScreenSpace(new Vector2(50, 20)))));
-            AddStep("drag to draw", () => InputManager.MoveTouchTo(new Touch(TouchSource.Touch1, this.ChildrenOfType<Playfield>().Single().ToScreenSpace(new Vector2(200, 50)))));
-            AddAssert("selection not initiated", () => this.ChildrenOfType<DragBox>().All(d => d.State == Visibility.Hidden));
-            AddAssert("blueprint visible", () => this.ChildrenOfType<SliderPlacementBlueprint>().Single().IsPresent);
-            AddStep("end", () => InputManager.EndTouch(new Touch(TouchSource.Touch1, InputManager.CurrentState.Touch.GetTouchPosition(TouchSource.Touch1)!.Value)));
-            AddAssert("slider placed correctly", () =>
-            {
-                var slider = (Slider)EditorBeatmap.HitObjects.Single(h => h.StartTime == EditorClock.CurrentTimeAccurate);
-                Assert.Multiple(() =>
-                {
-                    Assert.That(slider.Position.X, Is.EqualTo(50f).Within(0.01f));
-                    Assert.That(slider.Position.Y, Is.EqualTo(20f).Within(0.01f));
-                    Assert.That(slider.Path.ControlPoints.Count, Is.EqualTo(2));
-                    Assert.That(slider.Path.ControlPoints[0].Position, Is.EqualTo(Vector2.Zero));
-
-                    // the final position may be slightly off from the mouse position when drawing, account for that.
-                    Assert.That(slider.Path.ControlPoints[1].Position.X, Is.EqualTo(150).Within(5));
-                    Assert.That(slider.Path.ControlPoints[1].Position.Y, Is.EqualTo(30).Within(5));
-                });
-
-                return true;
-            });
-        }
-
-        private void tap(Drawable drawable, Vector2 offset = default) => tap(drawable.ToScreenSpace(drawable.LayoutRectangle.Centre + offset));
+        private void tap(Drawable drawable) => tap(drawable.ScreenSpaceDrawQuad.Centre);
 
         private void tap(Vector2 position)
-        {
-            hold(position);
-            InputManager.EndTouch(new Touch(TouchSource.Touch1, position));
-        }
-
-        private void hold(Drawable drawable, Vector2 offset = default) => hold(drawable.ToScreenSpace(drawable.LayoutRectangle.Centre + offset));
-
-        private void hold(Vector2 position)
         {
             InputManager.BeginTouch(new Touch(TouchSource.Touch1, position));
+            InputManager.EndTouch(new Touch(TouchSource.Touch1, position));
         }
     }
 }

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

@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             Mod = new OsuModAlternate(),
             PassCondition = () => Player.ScoreProcessor.Combo.Value == 4,
             Autoplay = false,
-            CreateBeatmap = () => new Beatmap
+            Beatmap = new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -68,7 +68,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             Mod = new OsuModAlternate(),
             PassCondition = () => Player.ScoreProcessor.Combo.Value == 0 && Player.ScoreProcessor.HighestCombo.Value == 1,
             Autoplay = false,
-            CreateBeatmap = () => new Beatmap
+            Beatmap = new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -101,7 +101,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             Mod = new OsuModAlternate(),
             PassCondition = () => Player.ScoreProcessor.Combo.Value == 1,
             Autoplay = false,
-            CreateBeatmap = () => new Beatmap
+            Beatmap = new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -131,7 +131,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             Mod = new OsuModAlternate(),
             PassCondition = () => Player.ScoreProcessor.Combo.Value == 0 && Player.ScoreProcessor.HighestCombo.Value == 2,
             Autoplay = false,
-            CreateBeatmap = () => new Beatmap
+            Beatmap = new Beatmap
             {
                 Breaks =
                 {

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

@@ -60,7 +60,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             CreateModTest(new ModTestData
             {
                 Autoplay = true,
-                CreateBeatmap = () => new Beatmap
+                Beatmap = new Beatmap
                 {
                     HitObjects = new List<HitObject>
                     {
@@ -90,7 +90,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             {
                 Autoplay = true,
                 Mod = mod,
-                CreateBeatmap = () => new Beatmap
+                Beatmap = new Beatmap
                 {
                     HitObjects =
                     {

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

@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         public void TestNoAdjustment() => CreateModTest(new ModTestData
         {
             Mod = new OsuModDifficultyAdjust(),
-            CreateBeatmap = () => new Beatmap
+            Beatmap = new Beatmap
             {
                 BeatmapInfo = new BeatmapInfo
                 {

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

@@ -68,7 +68,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                         Player.GameplayClockContainer.CurrentTime < 1000 && Player.ChildrenOfType<ModFlashlight<OsuHitObject>.Flashlight>().Single().FlashlightDim > 0;
                     return Player.GameplayState.HasPassed && !sliderDimmedBeforeStartTime;
                 },
-                CreateBeatmap = () => new OsuBeatmap
+                Beatmap = new OsuBeatmap
                 {
                     HitObjects = new List<OsuHitObject>
                     {
@@ -114,7 +114,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                         Player.GameplayClockContainer.CurrentTime >= 1000 && Player.ChildrenOfType<ModFlashlight<OsuHitObject>.Flashlight>().Single().FlashlightDim > 0;
                     return Player.GameplayState.HasPassed && sliderDimmed;
                 },
-                CreateBeatmap = () => new OsuBeatmap
+                Beatmap = new OsuBeatmap
                 {
                     HitObjects = new List<OsuHitObject>
                     {
@@ -153,7 +153,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                         Player.GameplayClockContainer.CurrentTime >= 1000 && Player.ChildrenOfType<ModFlashlight<OsuHitObject>.Flashlight>().Single().FlashlightDim > 0;
                     return Player.GameplayState.HasPassed && sliderDimmed;
                 },
-                CreateBeatmap = () => new OsuBeatmap
+                Beatmap = new OsuBeatmap
                 {
                     HitObjects = new List<OsuHitObject>
                     {

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

@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         {
             Mod = new TestOsuModHidden(),
             Autoplay = true,
-            CreateBeatmap = () => new Beatmap
+            Beatmap = new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -63,7 +63,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         {
             Mod = new TestOsuModHidden(),
             Autoplay = true,
-            CreateBeatmap = () => new Beatmap
+            Beatmap = new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -98,7 +98,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         {
             Mod = new TestOsuModHidden(),
             Autoplay = true,
-            CreateBeatmap = () => new Beatmap
+            Beatmap = new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -122,7 +122,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         {
             Mod = new OsuModHidden { OnlyFadeApproachCircles = { Value = true } },
             Autoplay = true,
-            CreateBeatmap = () => new Beatmap
+            Beatmap = new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {

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

@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         public void TestCorrectReflections([Values] OsuModMirror.MirrorType type, [Values] bool withStrictTracking) => CreateModTest(new ModTestData
         {
             Autoplay = true,
-            CreateBeatmap = () => new OsuBeatmap
+            Beatmap = new OsuBeatmap
             {
                 HitObjects =
                 {

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

@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                 },
                 Autoplay = true,
                 PassCondition = () => true,
-                CreateBeatmap = () => new Beatmap
+                Beatmap = new Beatmap
                 {
                     HitObjects = new List<HitObject>
                     {
@@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                 },
                 Autoplay = true,
                 PassCondition = () => true,
-                CreateBeatmap = () => new Beatmap
+                Beatmap = new Beatmap
                 {
                     HitObjects = new List<HitObject>
                     {
@@ -113,7 +113,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                 },
                 Autoplay = true,
                 PassCondition = () => true,
-                CreateBeatmap = () => new Beatmap
+                Beatmap = new Beatmap
                 {
                     HitObjects = new List<HitObject>
                     {

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

@@ -61,7 +61,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             Mod = new OsuModPerfect(),
             PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(true),
             Autoplay = false,
-            CreateBeatmap = () => new Beatmap
+            Beatmap = new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {

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

@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             {
                 AngleSharpness = { Value = angleSharpness }
             },
-            CreateBeatmap = jumpBeatmap,
+            Beatmap = jumpBeatmap,
             Autoplay = true,
             PassCondition = () => true
         });
@@ -50,15 +50,15 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             {
                 AngleSharpness = { Value = angleSharpness }
             },
-            CreateBeatmap = streamBeatmap,
+            Beatmap = streamBeatmap,
             Autoplay = true,
             PassCondition = () => true
         });
 
-        private OsuBeatmap jumpBeatmap() =>
+        private OsuBeatmap jumpBeatmap =>
             createHitCircleBeatmap(new[] { 100, 200, 300, 400 }, 8, 300, 2 * 300);
 
-        private OsuBeatmap streamBeatmap() =>
+        private OsuBeatmap streamBeatmap =>
             createHitCircleBeatmap(new[] { 10, 20, 30, 40, 50, 60, 70, 80 }, 16, 150, 4 * 150);
 
         private OsuBeatmap createHitCircleBeatmap(IEnumerable<int> spacings, int objectsPerSpacing, int interval, int beatLength)

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

@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             Mod = new OsuModSingleTap(),
             PassCondition = () => Player.ScoreProcessor.Combo.Value == 2,
             Autoplay = false,
-            CreateBeatmap = () => new Beatmap
+            Beatmap = new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -62,7 +62,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             Mod = new OsuModSingleTap(),
             PassCondition = () => Player.ScoreProcessor.Combo.Value == 0 && Player.ScoreProcessor.HighestCombo.Value == 1,
             Autoplay = false,
-            CreateBeatmap = () => new Beatmap
+            Beatmap = new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -100,7 +100,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             Mod = new OsuModSingleTap(),
             PassCondition = () => Player.ScoreProcessor.Combo.Value == 1,
             Autoplay = false,
-            CreateBeatmap = () => new Beatmap
+            Beatmap = new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -130,7 +130,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             Mod = new OsuModSingleTap(),
             PassCondition = () => Player.ScoreProcessor.Combo.Value == 0 && Player.ScoreProcessor.HighestCombo.Value == 2,
             Autoplay = false,
-            CreateBeatmap = () => new Beatmap
+            Beatmap = new Beatmap
             {
                 Breaks =
                 {

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

@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             {
                 Mod = new OsuModSpunOut(),
                 Autoplay = false,
-                CreateBeatmap = singleSpinnerBeatmap,
+                Beatmap = singleSpinnerBeatmap,
                 PassCondition = () =>
                 {
                     // Bind to the first spinner's results for further tracking.
@@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             {
                 Mods = mods,
                 Autoplay = false,
-                CreateBeatmap = singleSpinnerBeatmap,
+                Beatmap = singleSpinnerBeatmap,
                 PassCondition = () =>
                 {
                     var counter = Player.ChildrenOfType<SpinnerSpmCalculator>().SingleOrDefault();
@@ -101,7 +101,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             {
                 Mod = new OsuModSpunOut(),
                 Autoplay = false,
-                CreateBeatmap = singleSpinnerBeatmap,
+                Beatmap = singleSpinnerBeatmap,
                 PassCondition = () =>
                 {
                     // Bind to the first spinner's results for further tracking.
@@ -130,7 +130,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             });
         }
 
-        private Beatmap singleSpinnerBeatmap() => new Beatmap
+        private Beatmap singleSpinnerBeatmap => new Beatmap
         {
             HitObjects = new List<HitObject>
             {

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

@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         {
             Mod = new OsuModStrictTracking(),
             Autoplay = false,
-            CreateBeatmap = () => new Beatmap
+            Beatmap = new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {

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

@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             Mod = new OsuModSuddenDeath(),
             PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(false),
             Autoplay = false,
-            CreateBeatmap = () => new Beatmap
+            Beatmap = new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             Mod = new OsuModSuddenDeath(),
             PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(true),
             Autoplay = false,
-            CreateBeatmap = () => new Beatmap
+            Beatmap = new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {

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

@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 Autoplay = false,
                 Mod = new TestAutoMod(),
-                CreateBeatmap = () => new Beatmap
+                Beatmap = new Beatmap
                 {
                     HitObjects = { new HitCircle { Position = new Vector2(256, 192) } }
                 },
@@ -47,16 +47,18 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Test]
         public void TestMissViaNotHitting()
         {
+            var beatmap = new Beatmap
+            {
+                HitObjects = { new HitCircle { Position = new Vector2(256, 192) } }
+            };
+
             var hitWindows = new OsuHitWindows();
-            hitWindows.SetDifficulty(IBeatmapDifficultyInfo.DEFAULT_DIFFICULTY);
+            hitWindows.SetDifficulty(beatmap.Difficulty.OverallDifficulty);
 
             CreateModTest(new ModTestData
             {
                 Autoplay = false,
-                CreateBeatmap = () => new Beatmap
-                {
-                    HitObjects = { new HitCircle { Position = new Vector2(256, 192) } }
-                },
+                Beatmap = beatmap,
                 PassCondition = () => Player.Results.Count > 0 && Player.Results[0].TimeOffset >= hitWindows.WindowFor(HitResult.Meh) && !Player.Results[0].IsHit
             });
         }

osu.Game.Rulesets.Osu/Difficulty/Evaluators/AimEvaluator.cs

@@ -3,7 +3,6 @@
 
 using System;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
-using osu.Game.Rulesets.Difficulty.Utils;
 using osu.Game.Rulesets.Osu.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Osu.Objects;
 
@@ -34,9 +33,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
             var osuLastObj = (OsuDifficultyHitObject)current.Previous(0);
             var osuLastLastObj = (OsuDifficultyHitObject)current.Previous(1);
 
-            const int radius = OsuDifficultyHitObject.NORMALISED_RADIUS;
-            const int diameter = OsuDifficultyHitObject.NORMALISED_DIAMETER;
-
             // Calculate the velocity to the current hitobject, which starts with a base distance / time assuming the last object is a hitcircle.
             double currVelocity = osuCurrObj.LazyJumpDistance / osuCurrObj.StrainTime;
 
@@ -81,14 +77,14 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
                     wideAngleBonus = calcWideAngleBonus(currAngle);
                     acuteAngleBonus = calcAcuteAngleBonus(currAngle);
 
-                    if (DifficultyCalculationUtils.MillisecondsToBPM(osuCurrObj.StrainTime, 2) < 300) // Only buff deltaTime exceeding 300 bpm 1/2.
+                    if (osuCurrObj.StrainTime > 100) // Only buff deltaTime exceeding 300 bpm 1/2.
                         acuteAngleBonus = 0;
                     else
                     {
                         acuteAngleBonus *= calcAcuteAngleBonus(lastAngle) // Multiply by previous angle, we don't want to buff unless this is a wiggle type pattern.
-                                           * Math.Min(angleBonus, diameter * 1.25 / osuCurrObj.StrainTime) // The maximum velocity we buff is equal to 125 / strainTime
+                                           * Math.Min(angleBonus, 125 / osuCurrObj.StrainTime) // The maximum velocity we buff is equal to 125 / strainTime
                                            * Math.Pow(Math.Sin(Math.PI / 2 * Math.Min(1, (100 - osuCurrObj.StrainTime) / 25)), 2) // scale buff from 150 bpm 1/4 to 200 bpm 1/4
-                                           * Math.Pow(Math.Sin(Math.PI / 2 * (Math.Clamp(osuCurrObj.LazyJumpDistance, radius, diameter) - radius) / radius), 2); // Buff distance exceeding radius up to diameter.
+                                           * Math.Pow(Math.Sin(Math.PI / 2 * (Math.Clamp(osuCurrObj.LazyJumpDistance, 50, 100) - 50) / 50), 2); // Buff distance exceeding 50 (radius) up to 100 (diameter).
                     }
 
                     // Penalize wide angles if they're repeated, reducing the penalty as the lastAngle gets more acute.
@@ -108,7 +104,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
                 double distRatio = Math.Pow(Math.Sin(Math.PI / 2 * Math.Abs(prevVelocity - currVelocity) / Math.Max(prevVelocity, currVelocity)), 2);
 
                 // Reward for % distance up to 125 / strainTime for overlaps where velocity is still changing.
-                double overlapVelocityBuff = Math.Min(diameter * 1.25 / Math.Min(osuCurrObj.StrainTime, osuLastObj.StrainTime), Math.Abs(prevVelocity - currVelocity));
+                double overlapVelocityBuff = Math.Min(125 / Math.Min(osuCurrObj.StrainTime, osuLastObj.StrainTime), Math.Abs(prevVelocity - currVelocity));
 
                 velocityChangeBonus = overlapVelocityBuff * distRatio;
 

osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs

@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
-using osu.Game.Rulesets.Difficulty.Utils;
 using osu.Game.Rulesets.Osu.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Osu.Objects;
 
@@ -121,7 +120,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
                                 islandCount.Count++;
 
                             // repeated island (ex: triplet -> triplet)
-                            double power = DifficultyCalculationUtils.Logistic(island.Delta, maxValue: 2.75, multiplier: 0.24, midpointOffset: 58.33);
+                            double power = logistic(island.Delta, 2.75, 0.24, 14);
                             effectiveRatio *= Math.Min(3.0 / islandCount.Count, Math.Pow(1.0 / islandCount.Count, power));
 
                             islandCounts[countIndex] = (islandCount.Island, islandCount.Count);
@@ -173,6 +172,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
             return Math.Sqrt(4 + rhythmComplexitySum * rhythm_overall_multiplier) / 2.0; // produces multiplier that can be applied to strain. range [1, infinity) (not really though)
         }
 
+        private static double logistic(double x, double maxValue, double multiplier, double offset) => (maxValue / (1 + Math.Pow(Math.E, offset - (multiplier * x))));
+
         private class Island : IEquatable<Island>
         {
             private readonly double deltaDifferenceEpsilon;

osu.Game.Rulesets.Osu/Difficulty/Evaluators/SpeedEvaluator.cs

@@ -3,7 +3,6 @@
 
 using System;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
-using osu.Game.Rulesets.Difficulty.Utils;
 using osu.Game.Rulesets.Osu.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Osu.Objects;
 
@@ -11,8 +10,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
 {
     public static class SpeedEvaluator
     {
-        private const double single_spacing_threshold = OsuDifficultyHitObject.NORMALISED_DIAMETER * 1.25; // 1.25 circles distance between centers
-        private const double min_speed_bonus = 200; // 200 BPM 1/4th
+        private const double single_spacing_threshold = 125; // 1.25 circles distance between centers
+        private const double min_speed_bonus = 75; // ~200BPM
         private const double speed_balancing_factor = 40;
         private const double distance_multiplier = 0.94;
 
@@ -44,8 +43,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
             double speedBonus = 0.0;
 
             // Add additional scaling bonus for streams/bursts higher than 200bpm
-            if (DifficultyCalculationUtils.MillisecondsToBPM(strainTime) > min_speed_bonus)
-                speedBonus = 0.75 * Math.Pow((DifficultyCalculationUtils.BPMToMilliseconds(min_speed_bonus) - strainTime) / speed_balancing_factor, 2);
+            if (strainTime < min_speed_bonus)
+                speedBonus = 0.75 * Math.Pow((min_speed_bonus - strainTime) / speed_balancing_factor, 2);
 
             double travelDistance = osuPrevObj?.TravelDistance ?? 0;
             double distance = travelDistance + osuCurrObj.MinimumJumpDistance;

osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs

@@ -20,8 +20,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
         /// </summary>
         public const int NORMALISED_RADIUS = 50; // Change radius to 50 to make 100 the diameter. Easier for mental maths.
 
-        public const int NORMALISED_DIAMETER = NORMALISED_RADIUS * 2;
-
         public const int MIN_DELTA_TIME = 25;
 
         private const float maximum_slider_radius = NORMALISED_RADIUS * 2.4f;

osu.Game.Rulesets.Osu/Difficulty/Skills/OsuStrainSkill.cs

@@ -23,6 +23,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
         /// </summary>
         protected virtual double ReducedStrainBaseline => 0.75;
 
+        protected double Difficulty;
+
         protected OsuStrainSkill(Mod[] mods)
             : base(mods)
         {
@@ -30,7 +32,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
 
         public override double DifficultyValue()
         {
-            double difficulty = 0;
+            Difficulty = 0;
             double weight = 1;
 
             // Sections with 0 strain are excluded to avoid worst-case time complexity of the following sort (e.g. /b/2351871).
@@ -50,11 +52,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
             // We're sorting from highest to lowest strain.
             foreach (double strain in strains.OrderDescending())
             {
-                difficulty += strain * weight;
+                Difficulty += strain * weight;
                 weight *= DecayWeight;
             }
 
-            return difficulty;
+            return Difficulty;
         }
 
         public static double DifficultyToPerformance(double difficulty) => Math.Pow(5.0 * Math.Max(1.0, difficulty / 0.0675) - 4.0, 3.0) / 100000.0;

osu.Game.Rulesets.Osu/Edit/Blueprints/GridPlacementBlueprint.cs

@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Edit;
 using osuTK;
@@ -32,7 +31,12 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints
         public override void EndPlacement(bool commit)
         {
             if (!commit && PlacementActive != PlacementState.Finished)
-                resetGridState();
+            {
+                gridToolboxGroup.StartPosition.Value = originalOrigin;
+                gridToolboxGroup.Spacing.Value = originalSpacing;
+                if (!gridToolboxGroup.GridLinesRotation.Disabled)
+                    gridToolboxGroup.GridLinesRotation.Value = originalRotation;
+            }
 
             base.EndPlacement(commit);
 
@@ -99,9 +103,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints
 
         public override void UpdateTimeAndPosition(SnapResult result)
         {
-            if (State.Value == Visibility.Hidden)
-                return;
-
             var pos = ToLocalSpace(result.ScreenSpacePosition);
 
             if (PlacementActive != PlacementState.Active)
@@ -121,19 +122,5 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints
                 }
             }
         }
-
-        protected override void PopOut()
-        {
-            base.PopOut();
-            resetGridState();
-        }
-
-        private void resetGridState()
-        {
-            gridToolboxGroup.StartPosition.Value = originalOrigin;
-            gridToolboxGroup.Spacing.Value = originalSpacing;
-            if (!gridToolboxGroup.GridLinesRotation.Disabled)
-                gridToolboxGroup.GridLinesRotation.Value = originalRotation;
-        }
     }
 }

osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs

@@ -156,13 +156,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             return true;
         }
 
-        // this allows sliders to be drawn outside compose area (after starting from a point within the compose area).
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => base.ReceivePositionalInputAt(screenSpacePos) || PlacementActive == PlacementState.Active;
-
-        // ReceivePositionalInputAtSubTree generally always returns true when masking is disabled, but we don't want that,
-        // otherwise a slider path tooltip will be displayed anywhere in the editor (outside compose area).
-        protected override bool ReceivePositionalInputAtSubTree(Vector2 screenSpacePos) => ReceivePositionalInputAt(screenSpacePos);
-
         private void beginNewSegment(PathControlPoint lastPoint)
         {
             segmentStart = lastPoint;

osu.Game.Rulesets.Osu/Edit/OsuDistanceSnapProvider.cs

@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 {
     public partial class OsuDistanceSnapProvider : ComposerDistanceSnapProvider
     {
-        public override double ReadCurrentDistanceSnap(HitObject before, HitObject after)
+        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);

osu.Game.Rulesets.Osu/Edit/OsuGridToolboxGroup.cs

@@ -38,7 +38,6 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             MinValue = 0f,
             MaxValue = OsuPlayfield.BASE_SIZE.X,
-            Precision = 0.01f,
         };
 
         /// <summary>
@@ -48,7 +47,6 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             MinValue = 0f,
             MaxValue = OsuPlayfield.BASE_SIZE.Y,
-            Precision = 0.01f,
         };
 
         /// <summary>
@@ -58,7 +56,6 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             MinValue = 4f,
             MaxValue = 128f,
-            Precision = 0.01f,
         };
 
         /// <summary>
@@ -68,7 +65,6 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             MinValue = -180f,
             MaxValue = 180f,
-            Precision = 0.01f,
         };
 
         /// <summary>

osu.Game.Rulesets.Osu/Edit/PolygonGenerationPopover.cs

@@ -50,14 +50,9 @@ namespace osu.Game.Rulesets.Osu.Edit
         [Resolved]
         private HitObjectComposer composer { get; set; } = null!;
 
-        private Bindable<TernaryState> newComboState = null!;
-
         [BackgroundDependencyLoader]
         private void load()
         {
-            var selectionHandler = (EditorSelectionHandler)composer.BlueprintContainer.SelectionHandler;
-            newComboState = selectionHandler.SelectionNewComboState.GetBoundCopy();
-
             AllowableAnchors = new[] { Anchor.CentreLeft, Anchor.CentreRight };
 
             Child = new FillFlowContainer
@@ -125,11 +120,10 @@ namespace osu.Game.Rulesets.Osu.Edit
             changeHandler?.BeginChange();
             began = true;
 
-            distanceSnapInput.Current.BindValueChanged(_ => Scheduler.AddOnce(tryCreatePolygon));
-            offsetAngleInput.Current.BindValueChanged(_ => Scheduler.AddOnce(tryCreatePolygon));
-            repeatCountInput.Current.BindValueChanged(_ => Scheduler.AddOnce(tryCreatePolygon));
-            pointInput.Current.BindValueChanged(_ => Scheduler.AddOnce(tryCreatePolygon));
-            newComboState.BindValueChanged(_ => Scheduler.AddOnce(tryCreatePolygon));
+            distanceSnapInput.Current.BindValueChanged(_ => tryCreatePolygon());
+            offsetAngleInput.Current.BindValueChanged(_ => tryCreatePolygon());
+            repeatCountInput.Current.BindValueChanged(_ => tryCreatePolygon());
+            pointInput.Current.BindValueChanged(_ => tryCreatePolygon());
             tryCreatePolygon();
         }
 
@@ -144,69 +138,39 @@ namespace osu.Game.Rulesets.Osu.Edit
             double length = distanceSnapInput.Current.Value * velocity * timeSpacing;
             float polygonRadius = (float)(length / (2 * Math.Sin(double.Pi / pointInput.Current.Value)));
 
-            int totalPoints = pointInput.Current.Value * repeatCountInput.Current.Value;
+            editorBeatmap.RemoveRange(insertedCircles);
+            insertedCircles.Clear();
 
-            if (insertedCircles.Count > totalPoints)
+            var selectionHandler = (EditorSelectionHandler)composer.BlueprintContainer.SelectionHandler;
+            bool first = true;
+
+            for (int i = 1; i <= pointInput.Current.Value * repeatCountInput.Current.Value; ++i)
             {
-                editorBeatmap.RemoveRange(insertedCircles.GetRange(totalPoints, insertedCircles.Count - totalPoints));
-                insertedCircles.RemoveRange(totalPoints, insertedCircles.Count - totalPoints);
-            }
-
-            var newlyAdded = new List<HitCircle>();
-
-            for (int i = 0; i < totalPoints; ++i)
-            {
-                float angle = float.DegreesToRadians(offsetAngleInput.Current.Value) + (i + 1) * (2 * float.Pi / pointInput.Current.Value);
+                float angle = float.DegreesToRadians(offsetAngleInput.Current.Value) + i * (2 * float.Pi / pointInput.Current.Value);
                 var position = OsuPlayfield.BASE_SIZE / 2 + new Vector2(polygonRadius * float.Cos(angle), polygonRadius * float.Sin(angle));
-                bool newCombo = i == 0 && newComboState.Value == TernaryState.True;
 
-                HitCircle circle;
-
-                if (i < insertedCircles.Count)
+                var circle = new HitCircle
                 {
-                    circle = insertedCircles[i];
-
-                    circle.Position = position;
-                    circle.StartTime = startTime;
-                    circle.NewCombo = newCombo;
-
-                    editorBeatmap.Update(circle);
-                }
-                else
-                {
-                    circle = new HitCircle
-                    {
-                        Position = position,
-                        StartTime = startTime,
-                        NewCombo = newCombo,
-                    };
-
-                    newlyAdded.Add(circle);
-
-                    // TODO: probably ensure samples also follow current ternary status (not trivial)
-                    circle.Samples.Add(circle.CreateHitSampleInfo());
-                }
+                    Position = position,
+                    StartTime = startTime,
+                    NewCombo = first && selectionHandler.SelectionNewComboState.Value == TernaryState.True,
+                };
+                // TODO: probably ensure samples also follow current ternary status (not trivial)
+                circle.Samples.Add(circle.CreateHitSampleInfo());
 
                 if (position.X < 0 || position.Y < 0 || position.X > OsuPlayfield.BASE_SIZE.X || position.Y > OsuPlayfield.BASE_SIZE.Y)
                 {
                     commitButton.Enabled.Value = false;
-                    editorBeatmap.RemoveRange(insertedCircles);
-                    insertedCircles.Clear();
                     return;
                 }
 
+                insertedCircles.Add(circle);
                 startTime = beatSnapProvider.SnapTime(startTime + timeSpacing);
+
+                first = false;
             }
 
-            var previousNewComboState = newComboState.Value;
-
-            insertedCircles.AddRange(newlyAdded);
-            editorBeatmap.AddRange(newlyAdded);
-
-            // When adding new hitObjects, newCombo state will get reset to false when no objects are selected.
-            // Since this is the case when this popover is showing, we need to restore the previous newCombo state
-            newComboState.Value = previousNewComboState;
-
+            editorBeatmap.AddRange(insertedCircles);
             commitButton.Enabled.Value = true;
         }
 

osu.Game.Rulesets.Osu/Mods/OsuModBloom.cs

@@ -1,85 +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.Bindables;
-using osu.Framework.Localisation;
-using osu.Framework.Utils;
-using osu.Game.Configuration;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Overlays.Settings;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Osu.UI.Cursor;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Rulesets.UI;
-using osu.Game.Scoring;
-using osu.Game.Screens.Play;
-
-namespace osu.Game.Rulesets.Osu.Mods
-{
-    public class OsuModBloom : Mod, IApplicableToScoreProcessor, IUpdatableByPlayfield, IApplicableToPlayer
-    {
-        public override string Name => "Bloom";
-        public override string Acronym => "BM";
-        public override ModType Type => ModType.Fun;
-        public override LocalisableString Description => "The cursor blooms into.. a larger cursor!";
-        public override double ScoreMultiplier => 1;
-        protected const float MIN_SIZE = 1;
-        protected const float TRANSITION_DURATION = 100;
-        public override Type[] IncompatibleMods => new[] { typeof(OsuModFlashlight), typeof(OsuModNoScope), typeof(ModTouchDevice) };
-
-        protected readonly BindableNumber<int> CurrentCombo = new BindableInt();
-        protected readonly IBindable<bool> IsBreakTime = new Bindable<bool>();
-
-        private float currentSize;
-
-        [SettingSource(
-            "Max size at combo",
-            "The combo count at which the cursor reaches its maximum size",
-            SettingControlType = typeof(SettingsSlider<int, RoundedSliderBar<int>>)
-        )]
-        public BindableInt MaxSizeComboCount { get; } = new BindableInt(50)
-        {
-            MinValue = 5,
-            MaxValue = 100,
-        };
-
-        [SettingSource(
-            "Final size multiplier",
-            "The multiplier applied to cursor size when combo reaches maximum",
-            SettingControlType = typeof(SettingsSlider<float, RoundedSliderBar<float>>)
-        )]
-        public BindableFloat MaxCursorSize { get; } = new BindableFloat(10f)
-        {
-            MinValue = 5f,
-            MaxValue = 15f,
-            Precision = 0.5f,
-        };
-
-        public ScoreRank AdjustRank(ScoreRank rank, double accuracy) => rank;
-
-        public void ApplyToPlayer(Player player)
-        {
-            IsBreakTime.BindTo(player.IsBreakTime);
-        }
-
-        public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)
-        {
-            CurrentCombo.BindTo(scoreProcessor.Combo);
-            CurrentCombo.BindValueChanged(combo =>
-            {
-                currentSize = Math.Clamp(MaxCursorSize.Value * ((float)combo.NewValue / MaxSizeComboCount.Value), MIN_SIZE, MaxCursorSize.Value);
-            }, true);
-        }
-
-        public void Update(Playfield playfield)
-        {
-            OsuCursor cursor = (OsuCursor)(playfield.Cursor!.ActiveCursor);
-
-            if (IsBreakTime.Value)
-                cursor.ModScaleAdjust.Value = 1;
-            else
-                cursor.ModScaleAdjust.Value = (float)Interpolation.Lerp(cursor.ModScaleAdjust.Value, currentSize, Math.Clamp(cursor.Time.Elapsed / TRANSITION_DURATION, 0, 1));
-        }
-    }
-}

osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs

@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     public partial class OsuModFlashlight : ModFlashlight<OsuHitObject>, IApplicableToDrawableHitObject
     {
         public override double ScoreMultiplier => UsesDefaultConfiguration ? 1.12 : 1;
-        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModBloom), typeof(OsuModBlinds) }).ToArray();
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(OsuModBlinds)).ToArray();
 
         private const double default_follow_delay = 120;
 

osu.Game.Rulesets.Osu/Mods/OsuModNoScope.cs

@@ -20,8 +20,6 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         public override LocalisableString Description => "Where's the cursor?";
 
-        public override Type[] IncompatibleMods => new[] { typeof(OsuModBloom) };
-
         private PeriodTracker spinnerPeriods = null!;
 
         public override BindableInt HiddenComboCount { get; } = new BindableInt(10)

osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs

@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 {
     public class OsuModTouchDevice : ModTouchDevice
     {
-        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModAutopilot), typeof(OsuModBloom) }).ToArray();
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModAutopilot) }).ToArray();
         public override bool Ranked => UsesDefaultConfiguration;
     }
 }

osu.Game.Rulesets.Osu/OsuRuleset.cs

@@ -214,8 +214,7 @@ namespace osu.Game.Rulesets.Osu
                         new OsuModFreezeFrame(),
                         new OsuModBubbles(),
                         new OsuModSynesthesia(),
-                        new OsuModDepth(),
-                        new OsuModBloom()
+                        new OsuModDepth()
                     };
 
                 case ModType.System:

osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyNewStyleSpinner.cs

@@ -63,18 +63,18 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         Origin = Anchor.Centre,
                         Texture = source.GetTexture("spinner-top"),
                     },
-                    spinningMiddle = new Sprite
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Texture = source.GetTexture("spinner-middle2"),
-                    },
                     fixedMiddle = new Sprite
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                         Texture = source.GetTexture("spinner-middle"),
                     },
+                    spinningMiddle = new Sprite
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Texture = source.GetTexture("spinner-middle2"),
+                    },
                 }
             });
 

osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs

@@ -14,7 +14,6 @@ using osu.Framework.Graphics.Rendering.Vertices;
 using osu.Framework.Graphics.Shaders;
 using osu.Framework.Graphics.Shaders.Types;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.Graphics.Visualisation;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
 using osu.Framework.Timing;
@@ -24,7 +23,6 @@ using osuTK.Graphics.ES30;
 
 namespace osu.Game.Rulesets.Osu.UI.Cursor
 {
-    [DrawVisualiserHidden]
     public partial class CursorTrail : Drawable, IRequireHighFrequencyMousePosition
     {
         private const int max_sprites = 2048;

osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs

@@ -38,11 +38,6 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
         public IBindable<float> CursorScale => cursorScale;
 
-        /// <summary>
-        /// Mods which want to adjust cursor size should do so via this bindable.
-        /// </summary>
-        public readonly Bindable<float> ModScaleAdjust = new Bindable<float>(1);
-
         private readonly Bindable<float> cursorScale = new BindableFloat(1);
 
         private Bindable<float> userCursorScale = null!;
@@ -72,8 +67,6 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             autoCursorScale = config.GetBindable<bool>(OsuSetting.AutoCursorSize);
             autoCursorScale.ValueChanged += _ => cursorScale.Value = CalculateCursorScale();
 
-            ModScaleAdjust.ValueChanged += _ => cursorScale.Value = CalculateCursorScale();
-
             cursorScale.BindValueChanged(e => cursorScaleContainer.Scale = new Vector2(e.NewValue), true);
         }
 
@@ -97,7 +90,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
         protected virtual float CalculateCursorScale()
         {
-            float scale = userCursorScale.Value * ModScaleAdjust.Value;
+            float scale = userCursorScale.Value;
 
             if (autoCursorScale.Value && state != null)
             {

osu.Game.Rulesets.Taiko.Tests.iOS/osu.Game.Rulesets.Taiko.Tests.iOS.csproj

@@ -13,8 +13,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup Label="Project References">
-    <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
-    <ProjectReference Include="..\osu.Game.Tests\osu.Game.Tests.csproj" />
     <ProjectReference Include="..\osu.Game\osu.Game.csproj" />
+    <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
   </ItemGroup>
 </Project>

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

@@ -31,42 +31,40 @@ namespace osu.Game.Rulesets.Taiko.Tests.Mods
         {
             const double hit_time = 1;
 
+            var beatmap = new Beatmap<TaikoHitObject>
+            {
+                HitObjects = new List<TaikoHitObject>
+                {
+                    new Hit
+                    {
+                        Type = HitType.Rim,
+                        StartTime = hit_time,
+                    },
+                    new Hit
+                    {
+                        Type = HitType.Centre,
+                        StartTime = hit_time * 2,
+                    },
+                },
+                BeatmapInfo =
+                {
+                    Difficulty = new BeatmapDifficulty
+                    {
+                        SliderTickRate = 4,
+                        OverallDifficulty = 0,
+                    },
+                    Ruleset = new TaikoRuleset().RulesetInfo
+                },
+            };
+
+            beatmap.ControlPointInfo.Add(0, new EffectControlPoint { ScrollSpeed = 0.1f });
+
             CreateModTest(new ModTestData
             {
                 Mod = new TaikoModHidden(),
                 Autoplay = true,
                 PassCondition = checkAllMaxResultJudgements(2),
-                CreateBeatmap = () =>
-                {
-                    var beatmap = new Beatmap<TaikoHitObject>
-                    {
-                        HitObjects = new List<TaikoHitObject>
-                        {
-                            new Hit
-                            {
-                                Type = HitType.Rim,
-                                StartTime = hit_time,
-                            },
-                            new Hit
-                            {
-                                Type = HitType.Centre,
-                                StartTime = hit_time * 2,
-                            },
-                        },
-                        BeatmapInfo =
-                        {
-                            Difficulty = new BeatmapDifficulty
-                            {
-                                SliderTickRate = 4,
-                                OverallDifficulty = 0,
-                            },
-                            Ruleset = new TaikoRuleset().RulesetInfo
-                        },
-                    };
-
-                    beatmap.ControlPointInfo.Add(0, new EffectControlPoint { ScrollSpeed = 0.1f });
-                    return beatmap;
-                },
+                Beatmap = beatmap,
             });
         }
     }

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

@@ -15,26 +15,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Mods
         [Test]
         public void TestRelax()
         {
-            var beatmapForReplay = createBeatmap();
-
-            foreach (var ho in beatmapForReplay.HitObjects)
-                ho.ApplyDefaults(beatmapForReplay.ControlPointInfo, beatmapForReplay.Difficulty);
-
-            var replay = new TaikoAutoGenerator(beatmapForReplay).Generate();
-
-            foreach (var frame in replay.Frames.OfType<TaikoReplayFrame>().Where(r => r.Actions.Any()))
-                frame.Actions = [TaikoAction.LeftCentre];
-
-            CreateModTest(new ModTestData
-            {
-                Mod = new TaikoModRelax(),
-                CreateBeatmap = createBeatmap,
-                ReplayFrames = replay.Frames,
-                Autoplay = false,
-                PassCondition = () => Player.ScoreProcessor.HasCompleted.Value && Player.ScoreProcessor.Accuracy.Value == 1,
-            });
-
-            TaikoBeatmap createBeatmap() => new TaikoBeatmap
+            var beatmap = new TaikoBeatmap
             {
                 HitObjects =
                 {
@@ -44,6 +25,22 @@ namespace osu.Game.Rulesets.Taiko.Tests.Mods
                     new Swell { StartTime = 1250, Duration = 500 },
                 }
             };
+            foreach (var ho in beatmap.HitObjects)
+                ho.ApplyDefaults(beatmap.ControlPointInfo, beatmap.Difficulty);
+
+            var replay = new TaikoAutoGenerator(beatmap).Generate();
+
+            foreach (var frame in replay.Frames.OfType<TaikoReplayFrame>().Where(r => r.Actions.Any()))
+                frame.Actions = [TaikoAction.LeftCentre];
+
+            CreateModTest(new ModTestData
+            {
+                Mod = new TaikoModRelax(),
+                Beatmap = beatmap,
+                ReplayFrames = replay.Frames,
+                Autoplay = false,
+                PassCondition = () => Player.ScoreProcessor.HasCompleted.Value && Player.ScoreProcessor.Accuracy.Value == 1,
+            });
         }
     }
 }

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

@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Mods
         {
             Mod = new TaikoModSingleTap(),
             Autoplay = false,
-            CreateBeatmap = () => new Beatmap
+            Beatmap = new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -65,7 +65,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Mods
         {
             Mod = new TaikoModSingleTap(),
             Autoplay = false,
-            CreateBeatmap = () => new Beatmap
+            Beatmap = new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -110,7 +110,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Mods
         {
             Mod = new TaikoModSingleTap(),
             Autoplay = false,
-            CreateBeatmap = () => new Beatmap
+            Beatmap = new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -136,7 +136,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Mods
         {
             Mod = new TaikoModSingleTap(),
             Autoplay = false,
-            CreateBeatmap = () => new Beatmap
+            Beatmap = new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
@@ -175,7 +175,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Mods
         {
             Mod = new TaikoModSingleTap(),
             Autoplay = false,
-            CreateBeatmap = () => new Beatmap
+            Beatmap = new Beatmap
             {
                 Breaks =
                 {

osu.Game.Rulesets.Taiko/Difficulty/Evaluators/ColourEvaluator.cs

@@ -3,7 +3,6 @@
 
 using System;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
-using osu.Game.Rulesets.Difficulty.Utils;
 using osu.Game.Rulesets.Taiko.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Taiko.Difficulty.Preprocessing.Colour;
 using osu.Game.Rulesets.Taiko.Difficulty.Preprocessing.Colour.Data;
@@ -12,12 +11,26 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Evaluators
 {
     public class ColourEvaluator
     {
+        /// <summary>
+        /// A sigmoid function. It gives a value between (middle - height/2) and (middle + height/2).
+        /// </summary>
+        /// <param name="val">The input value.</param>
+        /// <param name="center">The center of the sigmoid, where the largest gradient occurs and value is equal to middle.</param>
+        /// <param name="width">The radius of the sigmoid, outside of which values are near the minimum/maximum.</param>
+        /// <param name="middle">The middle of the sigmoid output.</param>
+        /// <param name="height">The height of the sigmoid output. This will be equal to max value - min value.</param>
+        private static double sigmoid(double val, double center, double width, double middle, double height)
+        {
+            double sigmoid = Math.Tanh(Math.E * -(val - center) / width);
+            return sigmoid * (height / 2) + middle;
+        }
+
         /// <summary>
         /// Evaluate the difficulty of the first note of a <see cref="MonoStreak"/>.
         /// </summary>
         public static double EvaluateDifficultyOf(MonoStreak monoStreak)
         {
-            return DifficultyCalculationUtils.Logistic(exponent: Math.E * monoStreak.Index - 2 * Math.E) * EvaluateDifficultyOf(monoStreak.Parent) * 0.5;
+            return sigmoid(monoStreak.Index, 2, 2, 0.5, 1) * EvaluateDifficultyOf(monoStreak.Parent) * 0.5;
         }
 
         /// <summary>
@@ -25,7 +38,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Evaluators
         /// </summary>
         public static double EvaluateDifficultyOf(AlternatingMonoPattern alternatingMonoPattern)
         {
-            return DifficultyCalculationUtils.Logistic(exponent: Math.E * alternatingMonoPattern.Index - 2 * Math.E) * EvaluateDifficultyOf(alternatingMonoPattern.Parent);
+            return sigmoid(alternatingMonoPattern.Index, 2, 2, 0.5, 1) * EvaluateDifficultyOf(alternatingMonoPattern.Parent);
         }
 
         /// <summary>
@@ -33,7 +46,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Evaluators
         /// </summary>
         public static double EvaluateDifficultyOf(RepeatingHitPatterns repeatingHitPattern)
         {
-            return 2 * (1 - DifficultyCalculationUtils.Logistic(exponent: Math.E * repeatingHitPattern.RepetitionInterval - 2 * Math.E));
+            return 2 * (1 - sigmoid(repeatingHitPattern.RepetitionInterval, 2, 2, 0.5, 1));
         }
 
         public static double EvaluateDifficultyOf(DifficultyHitObject hitObject)

osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs

@@ -84,11 +84,8 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         protected virtual double ComputeTimeRange()
         {
-            // Using the constant algorithm results in a sluggish scroll speed that's equal to 60 BPM.
-            // We need to adjust it to the expected default scroll speed (BPM * base SV multiplier).
-            double multiplier = VisualisationMethod == ScrollVisualisationMethod.Constant
-                ? (Beatmap.BeatmapInfo.BPM * Beatmap.Difficulty.SliderMultiplier) / 60
-                : 1;
+            // Adjust when we're using constant algorithm to not be sluggish.
+            double multiplier = VisualisationMethod == ScrollVisualisationMethod.Constant ? 4 * Beatmap.Difficulty.SliderMultiplier : 1;
             return PlayfieldAdjustmentContainer.ComputeTimeRange() / multiplier;
         }
 

osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs

@@ -1000,7 +1000,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
                     Assert.That(decoded.BeatmapInfo.WidescreenStoryboard, Is.False);
                     Assert.That(decoded.BeatmapInfo.EpilepsyWarning, Is.False);
                     Assert.That(decoded.BeatmapInfo.SamplesMatchPlaybackRate, Is.False);
-                    Assert.That(decoded.BeatmapInfo.Countdown, Is.EqualTo(CountdownType.None));
+                    Assert.That(decoded.BeatmapInfo.Countdown, Is.EqualTo(CountdownType.Normal));
                     Assert.That(decoded.BeatmapInfo.CountdownOffset, Is.EqualTo(0));
                     Assert.That(decoded.BeatmapInfo.Metadata.PreviewTime, Is.EqualTo(-1));
                     Assert.That(decoded.BeatmapInfo.Ruleset.OnlineID, Is.EqualTo(0));

osu.Game.Tests/Beatmaps/IO/LegacyBeatmapExporterTest.cs

@@ -1,106 +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.IO;
-using System.Text;
-using NUnit.Framework;
-using osu.Framework.Allocation;
-using osu.Framework.Extensions;
-using osu.Framework.Extensions.ObjectExtensions;
-using osu.Framework.Testing;
-using osu.Game.Beatmaps;
-using osu.Game.Database;
-using osu.Game.IO.Archives;
-using osu.Game.Tests.Resources;
-using osu.Game.Tests.Visual;
-using MemoryStream = System.IO.MemoryStream;
-
-namespace osu.Game.Tests.Beatmaps.IO
-{
-    [HeadlessTest]
-    public partial class LegacyBeatmapExporterTest : OsuTestScene
-    {
-        [Resolved]
-        private BeatmapManager beatmaps { get; set; } = null!;
-
-        [Test]
-        public void TestObjectsSnappedAfterTruncatingExport()
-        {
-            IWorkingBeatmap beatmap = null!;
-            MemoryStream outStream = null!;
-
-            // Ensure importer encoding is correct
-            AddStep("import beatmap", () => beatmap = importBeatmapFromArchives(@"decimal-timing-beatmap.olz"));
-            AddAssert("timing point has decimal offset", () => beatmap.Beatmap.ControlPointInfo.TimingPoints[0].Time, () => Is.EqualTo(284.725).Within(0.001));
-            AddAssert("kiai has decimal offset", () => beatmap.Beatmap.ControlPointInfo.EffectPoints[0].Time, () => Is.EqualTo(28520.019).Within(0.001));
-            AddAssert("hit object has decimal offset", () => beatmap.Beatmap.HitObjects[0].StartTime, () => Is.EqualTo(28520.019).Within(0.001));
-
-            // Ensure exporter legacy conversion is correct
-            AddStep("export", () =>
-            {
-                outStream = new MemoryStream();
-
-                new LegacyBeatmapExporter(LocalStorage)
-                    .ExportToStream((BeatmapSetInfo)beatmap.BeatmapInfo.BeatmapSet!, outStream, null);
-            });
-
-            AddStep("import beatmap again", () => beatmap = importBeatmapFromStream(outStream));
-            AddAssert("timing point has truncated offset", () => beatmap.Beatmap.ControlPointInfo.TimingPoints[0].Time, () => Is.EqualTo(284).Within(0.001));
-            AddAssert("kiai is snapped", () => beatmap.Beatmap.ControlPointInfo.EffectPoints[0].Time, () => Is.EqualTo(28519).Within(0.001));
-            AddAssert("hit object is snapped", () => beatmap.Beatmap.HitObjects[0].StartTime, () => Is.EqualTo(28519).Within(0.001));
-        }
-
-        [Test]
-        public void TestExportStability()
-        {
-            IWorkingBeatmap beatmap = null!;
-            MemoryStream firstExport = null!;
-            MemoryStream secondExport = null!;
-
-            // Ensure importer encoding is correct
-            AddStep("import beatmap", () => beatmap = importBeatmapFromArchives(@"legacy-export-stability-test.olz"));
-            AddStep("export once", () =>
-            {
-                firstExport = new MemoryStream();
-
-                new LegacyBeatmapExporter(LocalStorage)
-                    .ExportToStream((BeatmapSetInfo)beatmap.BeatmapInfo.BeatmapSet!, firstExport, null);
-            });
-
-            AddStep("import beatmap again", () => beatmap = importBeatmapFromStream(firstExport));
-            AddStep("export again", () =>
-            {
-                secondExport = new MemoryStream();
-
-                new LegacyBeatmapExporter(LocalStorage)
-                    .ExportToStream((BeatmapSetInfo)beatmap.BeatmapInfo.BeatmapSet!, secondExport, null);
-            });
-
-            const string osu_filename = @"legacy export - stability test (spaceman_atlas) [].osu";
-
-            AddAssert("exports are identical",
-                () => getStringContentsOf(osu_filename, firstExport.GetBuffer()),
-                () => Is.EqualTo(getStringContentsOf(osu_filename, secondExport.GetBuffer())));
-
-            string getStringContentsOf(string filename, byte[] archiveBytes)
-            {
-                using var memoryStream = new MemoryStream(archiveBytes);
-                using var archiveReader = new ZipArchiveReader(memoryStream);
-                byte[] fileContent = archiveReader.GetStream(filename).ReadAllBytesToArray();
-                return Encoding.UTF8.GetString(fileContent);
-            }
-        }
-
-        private IWorkingBeatmap importBeatmapFromStream(Stream stream)
-        {
-            var imported = beatmaps.Import(new ImportTask(stream, "filename.osz")).GetResultSafely();
-            return imported.AsNonNull().PerformRead(s => beatmaps.GetWorkingBeatmap(s.Beatmaps[0]));
-        }
-
-        private IWorkingBeatmap importBeatmapFromArchives(string filename)
-        {
-            var imported = beatmaps.Import(new ImportTask(TestResources.OpenResource($@"Archives/{filename}"), filename)).GetResultSafely();
-            return imported.AsNonNull().PerformRead(s => beatmaps.GetWorkingBeatmap(s.Beatmaps[0]));
-        }
-    }
-}

osu.Game.Tests/ImportTest.cs

@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
@@ -65,10 +64,6 @@ namespace osu.Game.Tests
                 // Beatmap must be imported before the collection manager is loaded.
                 if (withBeatmap)
                     BeatmapManager.Import(TestResources.GetTestBeatmapForImport()).WaitSafely();
-
-                // the logic for setting the initial ruleset exists in OsuGame rather than OsuGameBase.
-                // the ruleset bindable is not meant to be nullable, so assign any ruleset in here.
-                Ruleset.Value = RulesetStore.AvailableRulesets.First();
             }
         }
     }

osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs

@@ -148,7 +148,6 @@ namespace osu.Game.Tests.NonVisual.Filtering
         [TestCase("tags too", false)]
         [TestCase("version", false)]
         [TestCase("an auteur", true)]
-        [TestCase("unit", false)]
         public void TestCriteriaMatchingTerms(string terms, bool filtered)
         {
             var exampleBeatmapInfo = getExampleBeatmap();
@@ -176,7 +175,6 @@ namespace osu.Game.Tests.NonVisual.Filtering
         [TestCase("\"Artist\"!", true)]
         [TestCase("\"The Artist\"!", false)]
         [TestCase("\"the artist\"!", false)]
-        [TestCase("\"unit tests\"!", false)]
         [TestCase("\"\\\"", true)] // nasty case, covers properly escaping user input in underlying regex.
         public void TestCriteriaMatchingExactTerms(string terms, bool filtered)
         {

osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs

@@ -501,18 +501,6 @@ namespace osu.Game.Tests.NonVisual.Filtering
             Assert.That(visibleBeatmaps, Is.EqualTo(expectedBeatmapIndexes));
         }
 
-        [Test]
-        public void TestApplySourceQueries()
-        {
-            const string query = "find me songs with source=\"unit tests\" please";
-            var filterCriteria = new FilterCriteria();
-            FilterQueryParser.ApplyQueries(filterCriteria, query);
-            Assert.AreEqual("find me songs with  please", filterCriteria.SearchText.Trim());
-            Assert.AreEqual(5, filterCriteria.SearchTerms.Length);
-            Assert.AreEqual("unit tests", filterCriteria.Source.SearchTerm);
-            Assert.That(filterCriteria.Source.MatchMode, Is.EqualTo(FilterCriteria.MatchMode.IsolatedPhrase));
-        }
-
         private class CustomFilterCriteria : IRulesetFilterCriteria
         {
             public string? CustomValue { get; set; }

osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs

@@ -73,9 +73,9 @@ namespace osu.Game.Tests.NonVisual.Multiplayer
             AddStep("create room initially in gameplay", () =>
             {
                 var newRoom = new Room();
-                newRoom.CopyFrom(SelectedRoom.Value!);
+                newRoom.CopyFrom(SelectedRoom.Value);
 
-                newRoom.RoomID = null;
+                newRoom.RoomID.Value = null;
                 MultiplayerClient.RoomSetupAction = room =>
                 {
                     room.State = MultiplayerRoomState.Playing;

osu.Game.Tests/NonVisual/Ranking/UnstableRateTest.cs

@@ -20,53 +20,12 @@ namespace osu.Game.Tests.NonVisual.Ranking
         public void TestDistributedHits()
         {
             var events = Enumerable.Range(-5, 11)
-                                   .Select(t => new HitEvent(t - 5, 1.0, HitResult.Great, new HitObject(), null, null))
-                                   .ToList();
+                                   .Select(t => new HitEvent(t - 5, 1.0, HitResult.Great, new HitObject(), null, null));
 
             var unstableRate = new UnstableRate(events);
 
             Assert.IsNotNull(unstableRate.Value);
-            Assert.AreEqual(unstableRate.Value.Value, 10 * Math.Sqrt(10), Precision.DOUBLE_EPSILON);
-        }
-
-        [Test]
-        public void TestDistributedHitsIncrementalRewind()
-        {
-            var events = Enumerable.Range(-5, 11)
-                                   .Select(t => new HitEvent(t - 5, 1.0, HitResult.Great, new HitObject(), null, null))
-                                   .ToList();
-
-            HitEventExtensions.UnstableRateCalculationResult result = null;
-
-            for (int i = 0; i < events.Count; i++)
-            {
-                result = events.GetRange(0, i + 1)
-                               .CalculateUnstableRate(result);
-            }
-
-            result = events.GetRange(0, 2).CalculateUnstableRate(result);
-
-            Assert.IsNotNull(result!.Result);
-            Assert.AreEqual(5, result.Result, Precision.DOUBLE_EPSILON);
-        }
-
-        [Test]
-        public void TestDistributedHitsIncremental()
-        {
-            var events = Enumerable.Range(-5, 11)
-                                   .Select(t => new HitEvent(t - 5, 1.0, HitResult.Great, new HitObject(), null, null))
-                                   .ToList();
-
-            HitEventExtensions.UnstableRateCalculationResult result = null;
-
-            for (int i = 0; i < events.Count; i++)
-            {
-                result = events.GetRange(0, i + 1)
-                               .CalculateUnstableRate(result);
-            }
-
-            Assert.IsNotNull(result!.Result);
-            Assert.AreEqual(10 * Math.Sqrt(10), result.Result, Precision.DOUBLE_EPSILON);
+            Assert.IsTrue(Precision.AlmostEquals(unstableRate.Value.Value, 10 * Math.Sqrt(10)));
         }
 
         [Test]

osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs

@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
@@ -19,12 +21,12 @@ namespace osu.Game.Tests.OnlinePlay
     [HeadlessTest]
     public partial class TestSceneCatchUpSyncManager : OsuTestScene
     {
-        private GameplayClockContainer master = null!;
-        private SpectatorSyncManager syncManager = null!;
+        private GameplayClockContainer master;
+        private SpectatorSyncManager syncManager;
 
-        private Dictionary<SpectatorPlayerClock, int> clocksById = null!;
-        private SpectatorPlayerClock player1 = null!;
-        private SpectatorPlayerClock player2 = null!;
+        private Dictionary<SpectatorPlayerClock, int> clocksById;
+        private SpectatorPlayerClock player1;
+        private SpectatorPlayerClock player2;
 
         [SetUp]
         public void Setup()

osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs

@@ -12,7 +12,6 @@ using osu.Framework.Platform;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Collections;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Dialog;
 using osu.Game.Rulesets;
@@ -206,9 +205,7 @@ namespace osu.Game.Tests.Visual.Collections
 
             AddStep("click first delete button", () =>
             {
-                InputManager.MoveMouseTo(dialog
-                                         .ChildrenOfType<DrawableCollectionListItem>().Single(i => i.Model.Value.Name == "1")
-                                         .ChildrenOfType<DrawableCollectionListItem.DeleteButton>().Single(), new Vector2(5, 0));
+                InputManager.MoveMouseTo(dialog.ChildrenOfType<DrawableCollectionListItem.DeleteButton>().First(), new Vector2(5, 0));
                 InputManager.Click(MouseButton.Left);
             });
 
@@ -216,11 +213,9 @@ namespace osu.Game.Tests.Visual.Collections
             assertCollectionCount(1);
             assertCollectionName(0, "2");
 
-            AddStep("click second delete button", () =>
+            AddStep("click first delete button", () =>
             {
-                InputManager.MoveMouseTo(dialog
-                                         .ChildrenOfType<DrawableCollectionListItem>().Single(i => i.Model.Value.Name == "2")
-                                         .ChildrenOfType<DrawableCollectionListItem.DeleteButton>().Single(), new Vector2(5, 0));
+                InputManager.MoveMouseTo(dialog.ChildrenOfType<DrawableCollectionListItem.DeleteButton>().First(), new Vector2(5, 0));
                 InputManager.Click(MouseButton.Left);
             });
 
@@ -315,7 +310,7 @@ namespace osu.Game.Tests.Visual.Collections
 
             AddStep("focus first collection", () =>
             {
-                InputManager.MoveMouseTo(firstItem = dialog.ChildrenOfType<DrawableCollectionListItem>().Single(i => i.Model.Value.Name == "1"));
+                InputManager.MoveMouseTo(firstItem = dialog.ChildrenOfType<DrawableCollectionListItem>().First());
                 InputManager.Click(MouseButton.Left);
             });
 
@@ -338,44 +333,10 @@ namespace osu.Game.Tests.Visual.Collections
             AddUntilStep("collection has new name", () => first.Name == "First");
         }
 
-        [Test]
-        public void TestSearch()
-        {
-            BeatmapCollection first = null!;
-
-            AddStep("add two collections", () =>
-            {
-                Realm.Write(r =>
-                {
-                    r.Add(new[]
-                    {
-                        first = new BeatmapCollection(name: "1"),
-                        new BeatmapCollection(name: "2"),
-                    });
-                });
-            });
-
-            assertCollectionName(0, "1");
-            assertCollectionName(1, "2");
-
-            AddStep("search for 1", () => dialog.ChildrenOfType<SearchTextBox>().Single().Current.Value = "1");
-
-            assertCollectionCount(1);
-
-            AddStep("change first collection name", () => Realm.Write(_ => first.Name = "First"));
-
-            assertCollectionCount(0);
-
-            AddStep("search for first", () => dialog.ChildrenOfType<SearchTextBox>().Single().Current.Value = "firs");
-
-            assertCollectionCount(1);
-        }
-
         private void assertCollectionCount(int count)
-            => AddUntilStep($"{count} collections shown", () => dialog.ChildrenOfType<DrawableCollectionListItem>().Count(i => i.IsPresent) == count + 1); // +1 for placeholder
+            => AddUntilStep($"{count} collections shown", () => dialog.ChildrenOfType<DrawableCollectionListItem>().Count() == count + 1); // +1 for placeholder
 
         private void assertCollectionName(int index, string name)
-            => AddUntilStep($"item {index + 1} has correct name",
-                () => dialog.ChildrenOfType<DrawableCollectionList>().Single().OrderedItems.ElementAt(index).ChildrenOfType<TextBox>().First().Text == name);
+            => AddUntilStep($"item {index + 1} has correct name", () => dialog.ChildrenOfType<DrawableCollectionListItem>().ElementAt(index).ChildrenOfType<TextBox>().First().Text == name);
     }
 }

osu.Game.Tests/Visual/DailyChallenge/TestSceneDailyChallenge.cs

@@ -39,18 +39,18 @@ namespace osu.Game.Tests.Visual.DailyChallenge
         {
             var room = new Room
             {
-                RoomID = 1234,
-                Name = "Daily Challenge: June 4, 2024",
+                RoomID = { Value = 1234 },
+                Name = { Value = "Daily Challenge: June 4, 2024" },
                 Playlist =
-                [
+                {
                     new PlaylistItem(TestResources.CreateTestBeatmapSetInfo().Beatmaps.First())
                     {
                         RequiredMods = [new APIMod(new OsuModTraceable())],
                         AllowedMods = [new APIMod(new OsuModDoubleTime())]
                     }
-                ],
-                EndDate = DateTimeOffset.Now.AddHours(12),
-                Category = RoomCategory.DailyChallenge
+                },
+                EndDate = { Value = DateTimeOffset.Now.AddHours(12) },
+                Category = { Value = RoomCategory.DailyChallenge }
             };
 
             AddStep("add room", () => API.Perform(new CreateRoomRequest(room)));
@@ -62,18 +62,18 @@ namespace osu.Game.Tests.Visual.DailyChallenge
         {
             var room = new Room
             {
-                RoomID = 1234,
-                Name = "Daily Challenge: June 4, 2024",
+                RoomID = { Value = 1234 },
+                Name = { Value = "Daily Challenge: June 4, 2024" },
                 Playlist =
-                [
+                {
                     new PlaylistItem(TestResources.CreateTestBeatmapSetInfo().Beatmaps.First())
                     {
                         RequiredMods = [new APIMod(new OsuModTraceable())],
                         AllowedMods = [new APIMod(new OsuModDoubleTime())]
                     }
-                ],
-                EndDate = DateTimeOffset.Now.AddHours(12),
-                Category = RoomCategory.DailyChallenge
+                },
+                EndDate = { Value = DateTimeOffset.Now.AddHours(12) },
+                Category = { Value = RoomCategory.DailyChallenge }
             };
 
             AddStep("add room", () => API.Perform(new CreateRoomRequest(room)));
@@ -91,18 +91,18 @@ namespace osu.Game.Tests.Visual.DailyChallenge
         {
             var room = new Room
             {
-                RoomID = 1234,
-                Name = "Daily Challenge: June 4, 2024",
+                RoomID = { Value = 1234 },
+                Name = { Value = "Daily Challenge: June 4, 2024" },
                 Playlist =
-                [
+                {
                     new PlaylistItem(TestResources.CreateTestBeatmapSetInfo().Beatmaps.First())
                     {
                         RequiredMods = [new APIMod(new OsuModTraceable())],
                         AllowedMods = [new APIMod(new OsuModDoubleTime())]
                     }
-                ],
-                EndDate = DateTimeOffset.Now.AddHours(12),
-                Category = RoomCategory.DailyChallenge
+                },
+                EndDate = { Value = DateTimeOffset.Now.AddHours(12) },
+                Category = { Value = RoomCategory.DailyChallenge }
             };
 
             AddStep("add room", () => API.Perform(new CreateRoomRequest(room)));

osu.Game.Tests/Visual/DailyChallenge/TestSceneDailyChallengeCarousel.cs

@@ -26,6 +26,11 @@ namespace osu.Game.Tests.Visual.DailyChallenge
 
         private readonly Bindable<Room> room = new Bindable<Room>(new Room());
 
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) => new CachedModelDependencyContainer<Room>(base.CreateChildDependencies(parent))
+        {
+            Model = { BindTarget = room }
+        };
+
         [Test]
         public void TestBasicAppearance()
         {
@@ -93,7 +98,7 @@ namespace osu.Game.Tests.Visual.DailyChallenge
                                 Origin = Anchor.Centre,
                                 Children = new Drawable[]
                                 {
-                                    new DailyChallengeTimeRemainingRing(room.Value),
+                                    new DailyChallengeTimeRemainingRing(),
                                     breakdown = new DailyChallengeScoreBreakdown(),
                                 }
                             }
@@ -120,8 +125,8 @@ namespace osu.Game.Tests.Visual.DailyChallenge
             AddSliderStep("update time remaining", 0f, 1f, 0f, progress =>
             {
                 var startedTimeAgo = TimeSpan.FromHours(24) * progress;
-                room.Value.StartDate = DateTimeOffset.Now - startedTimeAgo;
-                room.Value.EndDate = room.Value.StartDate.Value.AddDays(1);
+                room.Value.StartDate.Value = DateTimeOffset.Now - startedTimeAgo;
+                room.Value.EndDate.Value = room.Value.StartDate.Value.Value.AddDays(1);
             });
             AddStep("add normal score", () =>
             {

osu.Game.Tests/Visual/DailyChallenge/TestSceneDailyChallengeIntro.cs

@@ -38,7 +38,7 @@ namespace osu.Game.Tests.Visual.DailyChallenge
             Add(metadataClient);
 
             // add button to observe for daily challenge changes and perform its logic.
-            Add(new DailyChallengeButton(@"button-default-select", new Color4(102, 68, 204, 255), (_, _) => { }, 0, Key.D));
+            Add(new DailyChallengeButton(@"button-default-select", new Color4(102, 68, 204, 255), _ => { }, 0, Key.D));
         }
 
         [Test]
@@ -68,19 +68,19 @@ namespace osu.Game.Tests.Visual.DailyChallenge
             {
                 API.Perform(new CreateRoomRequest(room = new Room
                 {
-                    RoomID = roomId,
-                    Name = "Daily Challenge: June 4, 2024",
+                    RoomID = { Value = roomId },
+                    Name = { Value = "Daily Challenge: June 4, 2024" },
                     Playlist =
-                    [
+                    {
                         new PlaylistItem(CreateAPIBeatmap(new OsuRuleset().RulesetInfo))
                         {
                             RequiredMods = [new APIMod(new OsuModTraceable())],
                             AllowedMods = [new APIMod(new OsuModDoubleTime())]
                         }
-                    ],
-                    StartDate = DateTimeOffset.Now,
-                    EndDate = DateTimeOffset.Now.AddHours(24),
-                    Category = RoomCategory.DailyChallenge
+                    },
+                    StartDate = { Value = DateTimeOffset.Now },
+                    EndDate = { Value = DateTimeOffset.Now.AddHours(24) },
+                    Category = { Value = RoomCategory.DailyChallenge }
                 }));
             });
             AddStep("signal client", () => metadataClient.DailyChallengeUpdated(new DailyChallengeInfo { RoomID = roomId }));

osu.Game.Tests/Visual/DailyChallenge/TestSceneDailyChallengeLeaderboard.cs

@@ -43,7 +43,7 @@ namespace osu.Game.Tests.Visual.DailyChallenge
                     return false;
                 };
             });
-            AddStep("create leaderboard", () => Child = leaderboard = new DailyChallengeLeaderboard(new Room { RoomID = 1 }, new PlaylistItem(Beatmap.Value.BeatmapInfo))
+            AddStep("create leaderboard", () => Child = leaderboard = new DailyChallengeLeaderboard(new Room { RoomID = { Value = 1 } }, new PlaylistItem(Beatmap.Value.BeatmapInfo))
             {
                 RelativeSizeAxes = Axes.Both,
                 Anchor = Anchor.Centre,
@@ -86,7 +86,7 @@ namespace osu.Game.Tests.Visual.DailyChallenge
                     return false;
                 };
             });
-            AddStep("create leaderboard", () => Child = leaderboard = new DailyChallengeLeaderboard(new Room { RoomID = 1 }, new PlaylistItem(Beatmap.Value.BeatmapInfo))
+            AddStep("create leaderboard", () => Child = leaderboard = new DailyChallengeLeaderboard(new Room { RoomID = { Value = 1 } }, new PlaylistItem(Beatmap.Value.BeatmapInfo))
             {
                 RelativeSizeAxes = Axes.Both,
                 Anchor = Anchor.Centre,

osu.Game.Tests/Visual/DailyChallenge/TestSceneDailyChallengeTimeRemainingRing.cs

@@ -18,6 +18,11 @@ namespace osu.Game.Tests.Visual.DailyChallenge
     {
         private readonly Bindable<Room> room = new Bindable<Room>(new Room());
 
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) => new CachedModelDependencyContainer<Room>(base.CreateChildDependencies(parent))
+        {
+            Model = { BindTarget = room }
+        };
+
         [Cached]
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Plum);
 
@@ -33,7 +38,7 @@ namespace osu.Game.Tests.Visual.DailyChallenge
                     RelativeSizeAxes = Axes.Both,
                     Colour = colourProvider.Background4,
                 },
-                ring = new DailyChallengeTimeRemainingRing(room.Value)
+                ring = new DailyChallengeTimeRemainingRing
                 {
                     RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.Centre,
@@ -54,29 +59,29 @@ namespace osu.Game.Tests.Visual.DailyChallenge
 
             AddStep("just started", () =>
             {
-                room.Value.StartDate = DateTimeOffset.Now.AddMinutes(-1);
-                room.Value.EndDate = room.Value.StartDate.Value.AddDays(1);
+                room.Value.StartDate.Value = DateTimeOffset.Now.AddMinutes(-1);
+                room.Value.EndDate.Value = room.Value.StartDate.Value.Value.AddDays(1);
             });
             AddStep("midway through", () =>
             {
-                room.Value.StartDate = DateTimeOffset.Now.AddHours(-12);
-                room.Value.EndDate = room.Value.StartDate.Value.AddDays(1);
+                room.Value.StartDate.Value = DateTimeOffset.Now.AddHours(-12);
+                room.Value.EndDate.Value = room.Value.StartDate.Value.Value.AddDays(1);
             });
             AddStep("nearing end", () =>
             {
-                room.Value.StartDate = DateTimeOffset.Now.AddDays(-1).AddMinutes(8);
-                room.Value.EndDate = room.Value.StartDate.Value.AddDays(1);
+                room.Value.StartDate.Value = DateTimeOffset.Now.AddDays(-1).AddMinutes(8);
+                room.Value.EndDate.Value = room.Value.StartDate.Value.Value.AddDays(1);
             });
             AddStep("already ended", () =>
             {
-                room.Value.StartDate = DateTimeOffset.Now.AddDays(-2);
-                room.Value.EndDate = room.Value.StartDate.Value.AddDays(1);
+                room.Value.StartDate.Value = DateTimeOffset.Now.AddDays(-2);
+                room.Value.EndDate.Value = room.Value.StartDate.Value.Value.AddDays(1);
             });
             AddSliderStep("manual progress", 0f, 1f, 0f, progress =>
             {
                 var startedTimeAgo = TimeSpan.FromHours(24) * progress;
-                room.Value.StartDate = DateTimeOffset.Now - startedTimeAgo;
-                room.Value.EndDate = room.Value.StartDate.Value.AddDays(1);
+                room.Value.StartDate.Value = DateTimeOffset.Now - startedTimeAgo;
+                room.Value.EndDate.Value = room.Value.StartDate.Value.Value.AddDays(1);
             });
         }
     }

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

@@ -19,7 +19,6 @@ using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Edit;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Components.RadioButtons;
 using osu.Game.Screens.Edit.Components.TernaryButtons;
@@ -83,45 +82,6 @@ namespace osu.Game.Tests.Visual.Editing
             });
         }
 
-        [Test]
-        public void TestPlacementOutsideComposeScreen()
-        {
-            AddStep("clear all control points and hitobjects", () =>
-            {
-                editorBeatmap.ControlPointInfo.Clear();
-                editorBeatmap.Clear();
-            });
-
-            AddStep("Add timing point", () => editorBeatmap.ControlPointInfo.Add(0, new TimingControlPoint()));
-            AddStep("select circle", () => hitObjectComposer.ChildrenOfType<EditorRadioButton>().First(d => d.Button.Label == "HitCircle").TriggerClick());
-            AddStep("move mouse to compose", () => InputManager.MoveMouseTo(hitObjectComposer.ChildrenOfType<HitObjectContainer>().Single()));
-            AddStep("click", () => InputManager.Click(MouseButton.Left));
-            AddAssert("circle placed", () => editorBeatmap.HitObjects.Count == 1);
-
-            AddStep("move mouse outside compose", () => InputManager.MoveMouseTo(hitObjectComposer.ChildrenOfType<HitObjectContainer>().Single().ScreenSpaceDrawQuad.TopLeft - new Vector2(0f, 20f)));
-            AddStep("click", () => InputManager.Click(MouseButton.Left));
-            AddAssert("no circle placed", () => editorBeatmap.HitObjects.Count == 1);
-        }
-
-        [Test]
-        public void TestDragSliderOutsideComposeScreen()
-        {
-            AddStep("clear all control points and hitobjects", () =>
-            {
-                editorBeatmap.ControlPointInfo.Clear();
-                editorBeatmap.Clear();
-            });
-
-            AddStep("Add timing point", () => editorBeatmap.ControlPointInfo.Add(0, new TimingControlPoint()));
-            AddStep("select slider", () => hitObjectComposer.ChildrenOfType<EditorRadioButton>().First(d => d.Button.Label == "Slider").TriggerClick());
-
-            AddStep("move mouse to compose", () => InputManager.MoveMouseTo(hitObjectComposer.ChildrenOfType<HitObjectContainer>().Single()));
-            AddStep("hold", () => InputManager.PressButton(MouseButton.Left));
-            AddStep("move mouse outside compose", () => InputManager.MoveMouseTo(hitObjectComposer.ChildrenOfType<HitObjectContainer>().Single().ScreenSpaceDrawQuad.TopLeft - new Vector2(0f, 80f)));
-            AddStep("release", () => InputManager.ReleaseButton(MouseButton.Left));
-            AddAssert("slider placed", () => editorBeatmap.HitObjects.Count == 1);
-        }
-
         [Test]
         public void TestPlacementOnlyWorksWithTiming()
         {

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

@@ -527,11 +527,8 @@ namespace osu.Game.Tests.Visual.Editing
             checkPlacementSampleBank(HitSampleInfo.BANK_NORMAL);
             checkPlacementSampleAdditionBank(HitSampleInfo.BANK_NORMAL);
 
-            void checkPlacementSampleBank(string expected) => AddAssert($"Placement sample is {expected}",
-                () => EditorBeatmap.PlacementObject.Value.Samples.First(s => s.Name == HitSampleInfo.HIT_NORMAL).Bank, () => Is.EqualTo(expected));
-
-            void checkPlacementSampleAdditionBank(string expected) => AddAssert($"Placement sample addition is {expected}",
-                () => EditorBeatmap.PlacementObject.Value.Samples.First(s => s.Name != HitSampleInfo.HIT_NORMAL).Bank, () => Is.EqualTo(expected));
+            void checkPlacementSampleBank(string expected) => AddAssert($"Placement sample is {expected}", () => EditorBeatmap.PlacementObject.Value.Samples.First(s => s.Name == HitSampleInfo.HIT_NORMAL).Bank, () => Is.EqualTo(expected));
+            void checkPlacementSampleAdditionBank(string expected) => AddAssert($"Placement sample addition is {expected}", () => EditorBeatmap.PlacementObject.Value.Samples.First(s => s.Name != HitSampleInfo.HIT_NORMAL).Bank, () => Is.EqualTo(expected));
         }
 
         [Test]
@@ -784,39 +781,15 @@ namespace osu.Game.Tests.Visual.Editing
             setAdditionBankViaPopover(HitSampleInfo.BANK_SOFT);
             dismissPopover();
 
-            assertNoChanges();
+            hitObjectHasSamples(0, HitSampleInfo.HIT_NORMAL, HitSampleInfo.HIT_FINISH);
+            hitObjectHasSampleNormalBank(0, HitSampleInfo.BANK_NORMAL);
+            hitObjectHasSampleAdditionBank(0, HitSampleInfo.BANK_SOFT);
 
-            AddStep("select first object", () =>
-            {
-                EditorBeatmap.SelectedHitObjects.Clear();
-                EditorBeatmap.SelectedHitObjects.Add(EditorBeatmap.HitObjects[0]);
-            });
-            assertNoChanges();
+            AddStep("select first object", () => EditorBeatmap.SelectedHitObjects.Add(EditorBeatmap.HitObjects[0]));
 
-            AddStep("select second object", () =>
-            {
-                EditorBeatmap.SelectedHitObjects.Clear();
-                EditorBeatmap.SelectedHitObjects.Add(EditorBeatmap.HitObjects[1]);
-            });
-            assertNoChanges();
-
-            AddStep("select first object", () =>
-            {
-                EditorBeatmap.SelectedHitObjects.Clear();
-                EditorBeatmap.SelectedHitObjects.Add(EditorBeatmap.HitObjects[0]);
-            });
-            assertNoChanges();
-
-            void assertNoChanges()
-            {
-                hitObjectHasSamples(0, HitSampleInfo.HIT_NORMAL, HitSampleInfo.HIT_FINISH);
-                hitObjectHasSampleNormalBank(0, HitSampleInfo.BANK_NORMAL);
-                hitObjectHasSampleAdditionBank(0, HitSampleInfo.BANK_SOFT);
-
-                hitObjectHasSamples(1, HitSampleInfo.HIT_NORMAL);
-                hitObjectHasSampleNormalBank(1, HitSampleInfo.BANK_SOFT);
-                hitObjectHasSampleAdditionBank(1, HitSampleInfo.BANK_SOFT);
-            }
+            hitObjectHasSamples(0, HitSampleInfo.HIT_NORMAL, HitSampleInfo.HIT_FINISH);
+            hitObjectHasSampleNormalBank(0, HitSampleInfo.BANK_NORMAL);
+            hitObjectHasSampleAdditionBank(0, HitSampleInfo.BANK_SOFT);
         }
 
         private void clickSamplePiece(int objectIndex) => AddStep($"click {objectIndex.ToOrdinalWords()} sample piece", () =>
@@ -910,12 +883,11 @@ namespace osu.Game.Tests.Visual.Editing
             return h.Samples.All(o => o.Volume == volume);
         });
 
-        private void hitObjectNodeHasSampleVolume(int objectIndex, int nodeIndex, int volume) => AddAssert(
-            $"{objectIndex.ToOrdinalWords()} object {nodeIndex.ToOrdinalWords()} node has volume {volume}", () =>
-            {
-                var h = EditorBeatmap.HitObjects.ElementAt(objectIndex) as IHasRepeats;
-                return h is not null && h.NodeSamples[nodeIndex].All(o => o.Volume == volume);
-            });
+        private void hitObjectNodeHasSampleVolume(int objectIndex, int nodeIndex, int volume) => AddAssert($"{objectIndex.ToOrdinalWords()} object {nodeIndex.ToOrdinalWords()} node has volume {volume}", () =>
+        {
+            var h = EditorBeatmap.HitObjects.ElementAt(objectIndex) as IHasRepeats;
+            return h is not null && h.NodeSamples[nodeIndex].All(o => o.Volume == volume);
+        });
 
         private void setBankViaPopover(string bank) => AddStep($"set bank {bank} via popover", () =>
         {
@@ -972,33 +944,29 @@ namespace osu.Game.Tests.Visual.Editing
             return h.Samples.Where(o => o.Name != HitSampleInfo.HIT_NORMAL).All(o => o.Bank == bank);
         });
 
-        private void hitObjectNodeHasSamples(int objectIndex, int nodeIndex, params string[] samples) => AddAssert(
-            $"{objectIndex.ToOrdinalWords()} object {nodeIndex.ToOrdinalWords()} node has samples {string.Join(',', samples)}", () =>
-            {
-                var h = EditorBeatmap.HitObjects.ElementAt(objectIndex) as IHasRepeats;
-                return h is not null && h.NodeSamples[nodeIndex].Select(s => s.Name).SequenceEqual(samples);
-            });
+        private void hitObjectNodeHasSamples(int objectIndex, int nodeIndex, params string[] samples) => AddAssert($"{objectIndex.ToOrdinalWords()} object {nodeIndex.ToOrdinalWords()} node has samples {string.Join(',', samples)}", () =>
+        {
+            var h = EditorBeatmap.HitObjects.ElementAt(objectIndex) as IHasRepeats;
+            return h is not null && h.NodeSamples[nodeIndex].Select(s => s.Name).SequenceEqual(samples);
+        });
 
-        private void hitObjectNodeHasSampleBank(int objectIndex, int nodeIndex, string bank) => AddAssert($"{objectIndex.ToOrdinalWords()} object {nodeIndex.ToOrdinalWords()} node has bank {bank}",
-            () =>
-            {
-                var h = EditorBeatmap.HitObjects.ElementAt(objectIndex) as IHasRepeats;
-                return h is not null && h.NodeSamples[nodeIndex].All(o => o.Bank == bank);
-            });
+        private void hitObjectNodeHasSampleBank(int objectIndex, int nodeIndex, string bank) => AddAssert($"{objectIndex.ToOrdinalWords()} object {nodeIndex.ToOrdinalWords()} node has bank {bank}", () =>
+        {
+            var h = EditorBeatmap.HitObjects.ElementAt(objectIndex) as IHasRepeats;
+            return h is not null && h.NodeSamples[nodeIndex].All(o => o.Bank == bank);
+        });
 
-        private void hitObjectNodeHasSampleNormalBank(int objectIndex, int nodeIndex, string bank) => AddAssert(
-            $"{objectIndex.ToOrdinalWords()} object {nodeIndex.ToOrdinalWords()} node has normal bank {bank}", () =>
-            {
-                var h = EditorBeatmap.HitObjects.ElementAt(objectIndex) as IHasRepeats;
-                return h is not null && h.NodeSamples[nodeIndex].Where(o => o.Name == HitSampleInfo.HIT_NORMAL).All(o => o.Bank == bank);
-            });
+        private void hitObjectNodeHasSampleNormalBank(int objectIndex, int nodeIndex, string bank) => AddAssert($"{objectIndex.ToOrdinalWords()} object {nodeIndex.ToOrdinalWords()} node has normal bank {bank}", () =>
+        {
+            var h = EditorBeatmap.HitObjects.ElementAt(objectIndex) as IHasRepeats;
+            return h is not null && h.NodeSamples[nodeIndex].Where(o => o.Name == HitSampleInfo.HIT_NORMAL).All(o => o.Bank == bank);
+        });
 
-        private void hitObjectNodeHasSampleAdditionBank(int objectIndex, int nodeIndex, string bank) => AddAssert(
-            $"{objectIndex.ToOrdinalWords()} object {nodeIndex.ToOrdinalWords()} node has addition bank {bank}", () =>
-            {
-                var h = EditorBeatmap.HitObjects.ElementAt(objectIndex) as IHasRepeats;
-                return h is not null && h.NodeSamples[nodeIndex].Where(o => o.Name != HitSampleInfo.HIT_NORMAL).All(o => o.Bank == bank);
-            });
+        private void hitObjectNodeHasSampleAdditionBank(int objectIndex, int nodeIndex, string bank) => AddAssert($"{objectIndex.ToOrdinalWords()} object {nodeIndex.ToOrdinalWords()} node has addition bank {bank}", () =>
+        {
+            var h = EditorBeatmap.HitObjects.ElementAt(objectIndex) as IHasRepeats;
+            return h is not null && h.NodeSamples[nodeIndex].Where(o => o.Name != HitSampleInfo.HIT_NORMAL).All(o => o.Bank == bank);
+        });
 
         private void editorTimeIs(double time) => AddAssert($"editor time is {time}", () => Precision.AlmostEquals(EditorClock.CurrentTimeAccurate, time, 1));
     }

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

@@ -1,18 +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.Testing;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Mods;
-using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play.PlayerSettings;
 using osu.Game.Tests.Resources;
@@ -56,39 +52,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("No calibration button", () => !offsetControl.ChildrenOfType<SettingsButton>().Any());
         }
 
-        [Test]
-        public void TestNotEnoughTimedHitEvents()
-        {
-            AddStep("Set short reference score", () =>
-            {
-                List<HitEvent> hitEvents =
-                [
-                    // 10 events total. one of them (head circle) being timed / having hitwindows, rest having no hitwindows
-                    new HitEvent(30, 1, HitResult.LargeTickHit, new SliderHeadCircle { ClassicSliderBehaviour = true }, null, null),
-                    new HitEvent(0, 1, HitResult.LargeTickHit, new SliderTick(), null, null),
-                    new HitEvent(0, 1, HitResult.LargeTickHit, new SliderTick(), null, null),
-                    new HitEvent(0, 1, HitResult.LargeTickHit, new SliderTick(), null, null),
-                    new HitEvent(0, 1, HitResult.LargeTickHit, new SliderTick(), null, null),
-                    new HitEvent(0, 1, HitResult.LargeTickHit, new SliderTick(), null, null),
-                    new HitEvent(0, 1, HitResult.LargeTickHit, new SliderTick(), null, null),
-                    new HitEvent(0, 1, HitResult.LargeTickHit, new SliderTick(), null, null),
-                    new HitEvent(0, 1, HitResult.LargeTickHit, new SliderTick(), null, null),
-                    new HitEvent(0, 1, HitResult.LargeTickHit, new SliderTick(), null, null),
-                ];
-
-                foreach (var ev in hitEvents)
-                    ev.HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
-
-                offsetControl.ReferenceScore.Value = new ScoreInfo
-                {
-                    HitEvents = hitEvents,
-                    BeatmapInfo = Beatmap.Value.BeatmapInfo,
-                };
-            });
-
-            AddAssert("No calibration button", () => !offsetControl.ChildrenOfType<SettingsButton>().Any());
-        }
-
         [Test]
         public void TestScoreFromDifferentBeatmap()
         {