Merge pull request #5005 from peppy/fix-social-overlay-performance

Fix abysmal load performance when showing the social overlay

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: https://osu.ppy.sh/home/support

README.md

@@ -10,6 +10,8 @@ This project is still heavily under development, but is in a state where users a
 
 We are accepting bug reports (please report with as much detail as possible). Feature requests are welcome as long as you read and understand the contribution guidelines listed below.
 
+Detailed changelogs are published on the [official osu! site](https://osu.ppy.sh/home/changelog).
+
 ## Requirements
 
 - A desktop platform with the [.NET Core SDK 2.2](https://www.microsoft.com/net/learn/get-started) or higher installed.
@@ -20,17 +22,24 @@ We are accepting bug reports (please report with as much detail as possible). Fe
 
 ### Releases
 
-If you are not interested in developing the game, please head over to the [releases](https://github.com/ppy/osu/releases) to download a precompiled build with automatic updating enabled.
+![](https://puu.sh/DCmvA/f6a74f5fbb.png)
 
-- Windows (x64) users should download and run `install.exe`.
-- macOS users (10.12 "Sierra" and higher) should download and run `osu.app.zip`.
-- iOS users can join the [TestFlight beta program](https://t.co/xQJmHkfC18).
+If you are not interested in developing the game, you can consume our [binary releases](https://github.com/ppy/osu/releases).
+
+**Latest build:***
+
+| [Windows (x64)](https://github.com/ppy/osu/releases/latest/download/install.exe)  | [macOS 10.12+](https://github.com/ppy/osu/releases/latest/download/osu.app.zip) |
+| ------------- | ------------- |
+
+- **Linux** users are recommended to self-compile until we have official deployment in place.
+- **iOS** users can join the [TestFlight beta program](https://t.co/xQJmHkfC18) (note that due to high demand this is regularly full).
+- **Android** users can self-compile, and expect a public beta soon.
 
 If your platform is not listed above, there is still a chance you can manually build it by following the instructions below.
 
 ### Downloading the source code
 
-Clone the repository **including submodules**:
+Clone the repository:
 
 ```shell
 git clone https://github.com/ppy/osu
@@ -45,7 +54,7 @@ git pull
 
 ### Building
 
-Build configurations for the recommended IDEs (listed above) are included. You should use the provided Build/Run functionality of your IDE to get things going. When testing or building new components, it's highly encouraged you use the `VisualTests` project/configuration. More information on this provided below.
+Build configurations for the recommended IDEs (listed above) are included. You should use the provided Build/Run functionality of your IDE to get things going. When testing or building new components, it's highly encouraged you use the `VisualTests` project/configuration. More information on this provided [below](#contributing).
 
 > Visual Studio Code users must run the `Restore` task before any build attempt.
 

build/build.cake

@@ -1,5 +1,5 @@
 #addin "nuget:?package=CodeFileSanity&version=0.0.21"
-#addin "nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2018.3.4"
+#addin "nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2019.1.1"
 #tool "nuget:?package=NVika.MSBuild&version=1.0.1"
 var nVikaToolPath = GetFiles("./tools/NVika.MSBuild.*/tools/NVika.exe").First();
 

fastlane/Fastfile

@@ -35,7 +35,7 @@ platform :ios do
     changelog.gsub!('$BUILD_ID', options[:build])
 
     pilot(
-      wait_processing_interval: 900,
+      wait_processing_interval: 1800,
       changelog: changelog,
       ipa: './osu.iOS/bin/iPhone/Release/osu.iOS.ipa'
     )

osu.Desktop/OsuGameDesktop.cs

@@ -7,7 +7,6 @@ using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 using osu.Desktop.Overlays;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Platform;
 using osu.Game;
 using osuTK.Input;
@@ -56,7 +55,7 @@ namespace osu.Desktop
                 LoadComponentAsync(versionManager = new VersionManager { Depth = int.MinValue }, v =>
                 {
                     Add(v);
-                    v.State = Visibility.Visible;
+                    v.Show();
                 });
 
                 if (RuntimeInfo.OS == RuntimeInfo.Platform.Windows)
@@ -74,12 +73,11 @@ namespace osu.Desktop
             {
                 case Intro _:
                 case MainMenu _:
-                    if (versionManager != null)
-                        versionManager.State = Visibility.Visible;
+                    versionManager?.Show();
                     break;
+
                 default:
-                    if (versionManager != null)
-                        versionManager.State = Visibility.Hidden;
+                    versionManager?.Hide();
                     break;
             }
         }
@@ -87,6 +85,7 @@ namespace osu.Desktop
         public override void SetHost(GameHost host)
         {
             base.SetHost(host);
+
             if (host.Window is DesktopGameWindow desktopWindow)
             {
                 desktopWindow.CursorState |= CursorState.Hidden;

osu.Desktop/Overlays/VersionManager.cs

@@ -1,13 +1,11 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.Platform;
 using osu.Game;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
@@ -25,15 +23,13 @@ namespace osu.Desktop.Overlays
         private OsuConfigManager config;
         private OsuGameBase game;
         private NotificationOverlay notificationOverlay;
-        private GameHost host;
 
         [BackgroundDependencyLoader]
-        private void load(NotificationOverlay notification, OsuColour colours, TextureStore textures, OsuGameBase game, OsuConfigManager config, GameHost host)
+        private void load(NotificationOverlay notification, OsuColour colours, TextureStore textures, OsuGameBase game, OsuConfigManager config)
         {
             notificationOverlay = notification;
             this.config = config;
             this.game = game;
-            this.host = host;
 
             AutoSizeAxes = Axes.Both;
             Anchor = Anchor.BottomCentre;
@@ -95,33 +91,38 @@ namespace osu.Desktop.Overlays
 
             var version = game.Version;
             var lastVersion = config.Get<string>(OsuSetting.Version);
+
             if (game.IsDeployedBuild && version != lastVersion)
             {
                 config.Set(OsuSetting.Version, version);
 
                 // only show a notification if we've previously saved a version to the config file (ie. not the first run).
                 if (!string.IsNullOrEmpty(lastVersion))
-                    notificationOverlay.Post(new UpdateCompleteNotification(version, host.OpenUrlExternally));
+                    notificationOverlay.Post(new UpdateCompleteNotification(version));
             }
         }
 
         private class UpdateCompleteNotification : SimpleNotification
         {
-            public UpdateCompleteNotification(string version, Action<string> openUrl = null)
+            private readonly string version;
+
+            public UpdateCompleteNotification(string version)
             {
+                this.version = version;
                 Text = $"You are now running osu!lazer {version}.\nClick to see what's new!";
-                Icon = FontAwesome.Solid.CheckSquare;
-                Activated = delegate
-                {
-                    openUrl?.Invoke($"https://osu.ppy.sh/home/changelog/lazer/{version}");
-                    return true;
-                };
             }
 
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
+            private void load(OsuColour colours, ChangelogOverlay changelog)
             {
+                Icon = FontAwesome.Solid.CheckSquare;
                 IconBackgound.Colour = colours.BlueDark;
+
+                Activated = delegate
+                {
+                    changelog.ShowBuild(OsuGameBase.CLIENT_STREAM_NAME, version);
+                    return true;
+                };
             }
         }
 

osu.Desktop/Program.cs

@@ -31,6 +31,7 @@ namespace osu.Desktop
                     var importer = new ArchiveImportIPCChannel(host);
                     // Restore the cwd so relative paths given at the command line work correctly
                     Directory.SetCurrentDirectory(cwd);
+
                     foreach (var file in args)
                     {
                         Console.WriteLine(@"Importing {0}", file);

osu.Desktop/Updater/SimpleUpdateManager.cs

@@ -78,6 +78,7 @@ namespace osu.Desktop.Updater
                 case RuntimeInfo.Platform.Windows:
                     bestAsset = release.Assets?.Find(f => f.Name.EndsWith(".exe"));
                     break;
+
                 case RuntimeInfo.Platform.MacOsx:
                     bestAsset = release.Assets?.Find(f => f.Name.EndsWith(".app.zip"));
                     break;

osu.Desktop/Updater/SquirrelUpdateManager.cs

@@ -2,8 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.IO;
-using System.Reflection;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -169,23 +167,19 @@ namespace osu.Desktop.Updater
 
         private class SquirrelLogger : Splat.ILogger, IDisposable
         {
-            private readonly string path;
-            private readonly object locker = new object();
             public LogLevel Level { get; set; } = LogLevel.Info;
 
-            public SquirrelLogger()
-            {
-                var file = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "SquirrelSetupUpdater.log");
-                if (File.Exists(file)) File.Delete(file);
-                path = file;
-            }
+            private Logger logger;
 
             public void Write(string message, LogLevel logLevel)
             {
                 if (logLevel < Level)
                     return;
 
-                lock (locker) File.AppendAllText(path, message + "\r\n");
+                if (logger == null)
+                    logger = Logger.GetLogger("updater");
+
+                logger.Add(message);
             }
 
             public void Dispose()

osu.Desktop/osu.Desktop.csproj

@@ -26,9 +26,9 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="System.IO.Packaging" Version="4.5.0" />
-    <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.3" />
+    <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.4" />
   </ItemGroup>
   <ItemGroup Label="Resources">
     <EmbeddedResource Include="lazer.ico" />

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

@@ -36,11 +36,13 @@ namespace osu.Game.Rulesets.Catch.Tests
                         yield return new ConvertValue((CatchHitObject)nested);
 
                     break;
+
                 case BananaShower shower:
                     foreach (var nested in shower.NestedHitObjects)
                         yield return new ConvertValue((CatchHitObject)nested);
 
                     break;
+
                 default:
                     yield return new ConvertValue((CatchHitObject)hitObject);
 

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

@@ -13,21 +13,21 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
-    public class TestCaseAutoJuiceStream : PlayerTestCase
+    public class TestSceneAutoJuiceStream : PlayerTestScene
     {
-        public TestCaseAutoJuiceStream()
+        public TestSceneAutoJuiceStream()
             : base(new CatchRuleset())
         {
         }
 
-        protected override IBeatmap CreateBeatmap(Ruleset ruleset)
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {
             var beatmap = new Beatmap
             {
                 BeatmapInfo = new BeatmapInfo
                 {
                     BaseDifficulty = new BeatmapDifficulty { CircleSize = 6, SliderMultiplier = 3 },
-                    Ruleset = ruleset.RulesetInfo
+                    Ruleset = ruleset
                 }
             };
 

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

@@ -13,7 +13,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestCaseBananaShower : PlayerTestCase
+    public class TestSceneBananaShower : PlayerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -24,19 +24,19 @@ namespace osu.Game.Rulesets.Catch.Tests
             typeof(DrawableCatchRuleset),
         };
 
-        public TestCaseBananaShower()
+        public TestSceneBananaShower()
             : base(new CatchRuleset())
         {
         }
 
-        protected override IBeatmap CreateBeatmap(Ruleset ruleset)
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {
             var beatmap = new Beatmap
             {
                 BeatmapInfo = new BeatmapInfo
                 {
                     BaseDifficulty = new BeatmapDifficulty { CircleSize = 6 },
-                    Ruleset = ruleset.RulesetInfo
+                    Ruleset = ruleset
                 }
             };
 

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

@@ -7,9 +7,9 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestCaseCatchPlayer : PlayerTestCase
+    public class TestSceneCatchPlayer : PlayerTestScene
     {
-        public TestCaseCatchPlayer()
+        public TestSceneCatchPlayer()
             : base(new CatchRuleset())
         {
         }

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

@@ -9,21 +9,21 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestCaseCatchStacker : PlayerTestCase
+    public class TestSceneCatchStacker : PlayerTestScene
     {
-        public TestCaseCatchStacker()
+        public TestSceneCatchStacker()
             : base(new CatchRuleset())
         {
         }
 
-        protected override IBeatmap CreateBeatmap(Ruleset ruleset)
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {
             var beatmap = new Beatmap
             {
                 BeatmapInfo = new BeatmapInfo
                 {
                     BaseDifficulty = new BeatmapDifficulty { CircleSize = 6 },
-                    Ruleset = ruleset.RulesetInfo
+                    Ruleset = ruleset
                 }
             };
 

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

@@ -13,7 +13,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestCaseCatcherArea : OsuTestCase
+    public class TestSceneCatcherArea : OsuTestScene
     {
         private RulesetInfo catchRuleset;
         private TestCatcherArea catcherArea;
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             typeof(CatcherArea),
         };
 
-        public TestCaseCatcherArea()
+        public TestSceneCatcherArea()
         {
             AddSliderStep<float>("CircleSize", 0, 8, 5, createCatcher);
             AddToggleStep("Hyperdash", t => catcherArea.ToggleHyperDash(t));

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

@@ -15,7 +15,7 @@ using osuTK;
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestCaseFruitObjects : OsuTestCase
+    public class TestSceneFruitObjects : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             typeof(Pulp),
         };
 
-        public TestCaseFruitObjects()
+        public TestSceneFruitObjects()
         {
             Add(new GridContainer
             {

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

@@ -10,9 +10,9 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestCaseHyperDash : PlayerTestCase
+    public class TestSceneHyperDash : PlayerTestScene
     {
-        public TestCaseHyperDash()
+        public TestSceneHyperDash()
             : base(new CatchRuleset())
         {
         }
@@ -23,13 +23,13 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddAssert("First note is hyperdash", () => Beatmap.Value.Beatmap.HitObjects[0] is Fruit f && f.HyperDash);
         }
 
-        protected override IBeatmap CreateBeatmap(Ruleset ruleset)
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {
             var beatmap = new Beatmap
             {
                 BeatmapInfo =
                 {
-                    Ruleset = ruleset.RulesetInfo,
+                    Ruleset = ruleset,
                     BaseDifficulty = new BeatmapDifficulty { CircleSize = 3.6f }
                 }
             };

osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj

@@ -2,8 +2,8 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
-    <PackageReference Include="NUnit" Version="3.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>

osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs

@@ -31,6 +31,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
             initialiseHyperDash((List<CatchHitObject>)Beatmap.HitObjects);
 
             int index = 0;
+
             foreach (var obj in Beatmap.HitObjects.OfType<CatchHitObject>())
             {
                 obj.IndexInBeatmap = index++;
@@ -58,6 +59,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                         }
 
                         break;
+
                     case JuiceStream juiceStream:
                         foreach (var nested in juiceStream.NestedHitObjects)
                         {
@@ -103,6 +105,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                 double timeToNext = nextObject.StartTime - currentObject.StartTime - 1000f / 60f / 4; // 1/4th of a frame of grace time, taken from osu-stable
                 double distanceToNext = Math.Abs(nextObject.X - currentObject.X) - (lastDirection == thisDirection ? lastExcess : halfCatcherWidth);
                 float distanceToHyper = (float)(timeToNext * CatcherArea.Catcher.BASE_SPEED - distanceToNext);
+
                 if (distanceToHyper < 0)
                 {
                     currentObject.HyperDashTarget = nextObject;

osu.Game.Rulesets.Catch/CatchRuleset.cs

@@ -87,6 +87,7 @@ namespace osu.Game.Rulesets.Catch
                         new CatchModNoFail(),
                         new MultiMod(new CatchModHalfTime(), new CatchModDaycore())
                     };
+
                 case ModType.DifficultyIncrease:
                     return new Mod[]
                     {
@@ -96,17 +97,20 @@ namespace osu.Game.Rulesets.Catch
                         new CatchModHidden(),
                         new CatchModFlashlight(),
                     };
+
                 case ModType.Automation:
                     return new Mod[]
                     {
                         new MultiMod(new CatchModAutoplay(), new ModCinema()),
                         new CatchModRelax(),
                     };
+
                 case ModType.Fun:
                     return new Mod[]
                     {
                         new MultiMod(new ModWindUp<CatchHitObject>(), new ModWindDown<CatchHitObject>())
                     };
+
                 default:
                     return new Mod[] { };
             }

osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs

@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
         protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
         {
             if (beatmap.HitObjects.Count == 0)
-                return new CatchDifficultyAttributes { Mods = mods };
+                return new CatchDifficultyAttributes { Mods = mods, Skills = skills };
 
             // this is the same as osu!, so there's potential to share the implementation... maybe
             double preempt = BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.ApproachRate, 1800, 1200, 450) / clockRate;
@@ -41,7 +41,8 @@ namespace osu.Game.Rulesets.Catch.Difficulty
                 StarRating = Math.Sqrt(skills[0].DifficultyValue()) * star_scaling_factor,
                 Mods = mods,
                 ApproachRate = preempt > 1200.0 ? -(preempt - 1800.0) / 120.0 : -(preempt - 1200.0) / 150.0 + 5.0,
-                MaxCombo = beatmap.HitObjects.Count(h => h is Fruit) + beatmap.HitObjects.OfType<JuiceStream>().SelectMany(j => j.NestedHitObjects).Count(h => !(h is TinyDroplet))
+                MaxCombo = beatmap.HitObjects.Count(h => h is Fruit) + beatmap.HitObjects.OfType<JuiceStream>().SelectMany(j => j.NestedHitObjects).Count(h => !(h is TinyDroplet)),
+                Skills = skills
             };
         }
 
@@ -57,32 +58,20 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 
             CatchHitObject lastObject = null;
 
-            foreach (var hitObject in beatmap.HitObjects.OfType<CatchHitObject>())
+            // In 2B beatmaps, it is possible that a normal Fruit is placed in the middle of a JuiceStream.
+            foreach (var hitObject in beatmap.HitObjects
+                                             .SelectMany(obj => obj is JuiceStream stream ? stream.NestedHitObjects : new[] { obj })
+                                             .Cast<CatchHitObject>()
+                                             .OrderBy(x => x.StartTime))
             {
-                if (lastObject == null)
-                {
-                    lastObject = hitObject;
+                // We want to only consider fruits that contribute to the combo.
+                if (hitObject is BananaShower || hitObject is TinyDroplet)
                     continue;
-                }
 
-                switch (hitObject)
-                {
-                    // We want to only consider fruits that contribute to the combo. Droplets are addressed as accuracy and spinners are not relevant for "skill" calculations.
-                    case Fruit fruit:
-                        yield return new CatchDifficultyHitObject(fruit, lastObject, clockRate, halfCatchWidth);
+                if (lastObject != null)
+                    yield return new CatchDifficultyHitObject(hitObject, lastObject, clockRate, halfCatchWidth);
 
-                        lastObject = hitObject;
-                        break;
-                    case JuiceStream _:
-                        foreach (var nested in hitObject.NestedHitObjects.OfType<CatchHitObject>().Where(o => !(o is TinyDroplet)))
-                        {
-                            yield return new CatchDifficultyHitObject(nested, lastObject, clockRate, halfCatchWidth);
-
-                            lastObject = nested;
-                        }
-
-                        break;
-                }
+                lastObject = hitObject;
             }
         }
 

osu.Game.Rulesets.Catch/Judgements/CatchBananaJudgement.cs

@@ -16,6 +16,7 @@ namespace osu.Game.Rulesets.Catch.Judgements
             {
                 default:
                     return 0;
+
                 case HitResult.Perfect:
                     return 1100;
             }
@@ -27,6 +28,7 @@ namespace osu.Game.Rulesets.Catch.Judgements
             {
                 default:
                     return 0;
+
                 case HitResult.Perfect:
                     return 0.008;
             }

osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs

@@ -13,6 +13,7 @@ namespace osu.Game.Rulesets.Catch.Judgements
             {
                 default:
                     return 0;
+
                 case HitResult.Perfect:
                     return 30;
             }
@@ -24,6 +25,7 @@ namespace osu.Game.Rulesets.Catch.Judgements
             {
                 default:
                     return base.HealthIncreaseFor(result);
+
                 case HitResult.Perfect:
                     return 0.007;
             }

osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs

@@ -17,6 +17,7 @@ namespace osu.Game.Rulesets.Catch.Judgements
             {
                 default:
                     return 0;
+
                 case HitResult.Perfect:
                     return 300;
             }
@@ -28,6 +29,7 @@ namespace osu.Game.Rulesets.Catch.Judgements
             {
                 default:
                     return -0.02;
+
                 case HitResult.Perfect:
                     return 0.01;
             }

osu.Game.Rulesets.Catch/Judgements/CatchTinyDropletJudgement.cs

@@ -15,6 +15,7 @@ namespace osu.Game.Rulesets.Catch.Judgements
             {
                 default:
                     return 0;
+
                 case HitResult.Perfect:
                     return 10;
             }
@@ -26,6 +27,7 @@ namespace osu.Game.Rulesets.Catch.Judgements
             {
                 default:
                     return 0;
+
                 case HitResult.Perfect:
                     return 0.004;
             }

osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs

@@ -84,6 +84,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                     case ArmedState.Miss:
                         this.FadeOut(250).RotateTo(Rotation * 2, 250, Easing.Out).Expire();
                         break;
+
                     case ArmedState.Hit:
                         this.FadeOut().Expire();
                         break;

osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs

@@ -106,6 +106,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
             {
                 default:
                     return new Container();
+
                 case FruitVisualRepresentation.Raspberry:
                     return new Container
                     {
@@ -144,6 +145,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                             },
                         }
                     };
+
                 case FruitVisualRepresentation.Pineapple:
                     return new Container
                     {
@@ -182,6 +184,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                             },
                         }
                     };
+
                 case FruitVisualRepresentation.Pear:
                     return new Container
                     {
@@ -214,6 +217,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                             },
                         }
                     };
+
                 case FruitVisualRepresentation.Grape:
                     return new Container
                     {
@@ -246,6 +250,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                             },
                         }
                     };
+
                 case FruitVisualRepresentation.Banana:
                     return new Container
                     {
@@ -283,19 +288,25 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                 default:
                 case FruitVisualRepresentation.Pear:
                     return new Color4(17, 136, 170, 255);
+
                 case FruitVisualRepresentation.Grape:
                     return new Color4(204, 102, 0, 255);
+
                 case FruitVisualRepresentation.Raspberry:
                     return new Color4(121, 9, 13, 255);
+
                 case FruitVisualRepresentation.Pineapple:
                     return new Color4(102, 136, 0, 255);
+
                 case FruitVisualRepresentation.Banana:
                     switch (RNG.Next(0, 3))
                     {
                         default:
                             return new Color4(255, 240, 0, 255);
+
                         case 1:
                             return new Color4(255, 192, 0, 255);
+
                         case 2:
                             return new Color4(214, 221, 28, 255);
                     }

osu.Game.Rulesets.Catch/Objects/JuiceStream.cs

@@ -95,6 +95,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                             X = X + Path.PositionAt(e.PathProgress).X / CatchPlayfield.BASE_WIDTH,
                         });
                         break;
+
                     case SliderEventType.Head:
                     case SliderEventType.Tail:
                     case SliderEventType.Repeat:

osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs

@@ -32,6 +32,7 @@ namespace osu.Game.Rulesets.Catch.Scoring
             {
                 case HitResult.Miss:
                     return hpDrainRate;
+
                 default:
                     return 10.2 - hpDrainRate; // Award less HP as drain rate is increased
             }

osu.Game.Rulesets.Catch/UI/CatcherArea.cs

@@ -292,6 +292,7 @@ namespace osu.Game.Rulesets.Catch.UI
                 const float hyper_dash_transition_length = 180;
 
                 bool previouslyHyperDashing = HyperDashing;
+
                 if (modifier <= 1 || X == targetPosition)
                 {
                     hyperDashModifier = 1;
@@ -325,9 +326,11 @@ namespace osu.Game.Rulesets.Catch.UI
                     case CatchAction.MoveLeft:
                         currentDirection--;
                         return true;
+
                     case CatchAction.MoveRight:
                         currentDirection++;
                         return true;
+
                     case CatchAction.Dash:
                         Dashing = true;
                         return true;
@@ -343,9 +346,11 @@ namespace osu.Game.Rulesets.Catch.UI
                     case CatchAction.MoveLeft:
                         currentDirection++;
                         return true;
+
                     case CatchAction.MoveRight:
                         currentDirection--;
                         return true;
+
                     case CatchAction.Dash:
                         Dashing = false;
                         return true;
@@ -374,8 +379,8 @@ namespace osu.Game.Rulesets.Catch.UI
                 X = (float)MathHelper.Clamp(X + direction * Clock.ElapsedFrameTime * speed, 0, 1);
 
                 // Correct overshooting.
-                if (hyperDashDirection > 0 && hyperDashTargetPosition < X ||
-                    hyperDashDirection < 0 && hyperDashTargetPosition > X)
+                if ((hyperDashDirection > 0 && hyperDashTargetPosition < X) ||
+                    (hyperDashDirection < 0 && hyperDashTargetPosition > X))
                 {
                     X = hyperDashTargetPosition;
                     SetHyperDashState();

osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs

@@ -48,14 +48,19 @@ namespace osu.Game.Rulesets.Catch.UI
             {
                 case Banana banana:
                     return new DrawableBanana(banana);
+
                 case Fruit fruit:
                     return new DrawableFruit(fruit);
+
                 case JuiceStream stream:
                     return new DrawableJuiceStream(stream, CreateDrawableRepresentation);
+
                 case BananaShower shower:
                     return new DrawableBananaShower(shower, CreateDrawableRepresentation);
+
                 case TinyDroplet tiny:
                     return new DrawableTinyDroplet(tiny);
+
                 case Droplet droplet:
                     return new DrawableDroplet(droplet);
             }

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

@@ -8,12 +8,12 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Mania.Tests
 {
-    public abstract class ManiaInputTestCase : OsuTestCase
+    public abstract class ManiaInputTestScene : OsuTestScene
     {
         private readonly Container<Drawable> content;
         protected override Container<Drawable> Content => content ?? base.Content;
 
-        protected ManiaInputTestCase(int keys)
+        protected ManiaInputTestScene(int keys)
         {
             base.Content.Add(content = new LocalInputManager(keys));
         }

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

@@ -20,14 +20,14 @@ using osuTK.Graphics;
 namespace osu.Game.Rulesets.Mania.Tests
 {
     [Cached(Type = typeof(IManiaHitObjectComposer))]
-    public abstract class ManiaPlacementBlueprintTestCase : PlacementBlueprintTestCase, IManiaHitObjectComposer
+    public abstract class ManiaPlacementBlueprintTestScene : PlacementBlueprintTestScene, IManiaHitObjectComposer
     {
         private readonly Column column;
 
         [Cached(typeof(IReadOnlyList<Mod>))]
         private IReadOnlyList<Mod> mods { get; set; } = Array.Empty<Mod>();
 
-        protected ManiaPlacementBlueprintTestCase()
+        protected ManiaPlacementBlueprintTestScene()
         {
             Add(column = new Column(0)
             {

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

@@ -13,14 +13,14 @@ using osuTK.Graphics;
 namespace osu.Game.Rulesets.Mania.Tests
 {
     [Cached(Type = typeof(IManiaHitObjectComposer))]
-    public abstract class ManiaSelectionBlueprintTestCase : SelectionBlueprintTestCase, IManiaHitObjectComposer
+    public abstract class ManiaSelectionBlueprintTestScene : SelectionBlueprintTestScene, IManiaHitObjectComposer
     {
         [Cached(Type = typeof(IAdjustableClock))]
         private readonly IAdjustableClock clock = new StopwatchClock();
 
         private readonly Column column;
 
-        protected ManiaSelectionBlueprintTestCase()
+        protected ManiaSelectionBlueprintTestScene()
         {
             Add(column = new Column(0)
             {

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

@@ -12,7 +12,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Mania.Tests
 {
     [TestFixture]
-    public class TestCaseAutoGeneration : OsuTestCase
+    public class TestSceneAutoGeneration : OsuTestScene
     {
         [Test]
         public void TestSingleNote()

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

@@ -22,7 +22,7 @@ using osuTK.Graphics;
 namespace osu.Game.Rulesets.Mania.Tests
 {
     [TestFixture]
-    public class TestCaseColumn : ManiaInputTestCase
+    public class TestSceneColumn : ManiaInputTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
         private readonly List<Column> columns = new List<Column>();
 
-        public TestCaseColumn()
+        public TestSceneColumn()
             : base(2)
         {
         }

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

@@ -11,11 +11,11 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Mania.Tests
 {
     [TestFixture]
-    public class TestCaseEditor : EditorTestCase
+    public class TestSceneEditor : EditorTestScene
     {
         private readonly Bindable<ManiaScrollingDirection> direction = new Bindable<ManiaScrollingDirection>();
 
-        public TestCaseEditor()
+        public TestSceneEditor()
             : base(new ManiaRuleset())
         {
             AddStep("upwards scroll", () => direction.Value = ManiaScrollingDirection.Up);

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

@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Mania.Tests
 {
-    public class TestCaseHoldNotePlacementBlueprint : ManiaPlacementBlueprintTestCase
+    public class TestSceneHoldNotePlacementBlueprint : ManiaPlacementBlueprintTestScene
     {
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableHoldNote((HoldNote)hitObject);
         protected override PlacementBlueprint CreateBlueprint() => new HoldNotePlacementBlueprint();

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

@@ -15,14 +15,14 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Mania.Tests
 {
-    public class TestCaseHoldNoteSelectionBlueprint : ManiaSelectionBlueprintTestCase
+    public class TestSceneHoldNoteSelectionBlueprint : ManiaSelectionBlueprintTestScene
     {
         private readonly DrawableHoldNote drawableObject;
 
         protected override Container<Drawable> Content => content ?? base.Content;
         private readonly Container content;
 
-        public TestCaseHoldNoteSelectionBlueprint()
+        public TestSceneHoldNoteSelectionBlueprint()
         {
             var holdNote = new HoldNote { Column = 0, Duration = 1000 };
             holdNote.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());

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

@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Mania.Tests
 {
-    public class TestCaseNotePlacementBlueprint : ManiaPlacementBlueprintTestCase
+    public class TestSceneNotePlacementBlueprint : ManiaPlacementBlueprintTestScene
     {
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableNote((Note)hitObject);
         protected override PlacementBlueprint CreateBlueprint() => new NotePlacementBlueprint();

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

@@ -15,14 +15,14 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Tests
 {
-    public class TestCaseNoteSelectionBlueprint : ManiaSelectionBlueprintTestCase
+    public class TestSceneNoteSelectionBlueprint : ManiaSelectionBlueprintTestScene
     {
         private readonly DrawableNote drawableObject;
 
         protected override Container<Drawable> Content => content ?? base.Content;
         private readonly Container content;
 
-        public TestCaseNoteSelectionBlueprint()
+        public TestSceneNoteSelectionBlueprint()
         {
             var note = new Note { Column = 0 };
             note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());

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

@@ -11,10 +11,10 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -27,7 +27,7 @@ using osuTK.Graphics;
 namespace osu.Game.Rulesets.Mania.Tests
 {
     [TestFixture]
-    public class TestCaseNotes : OsuTestCase
+    public class TestSceneNotes : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -138,7 +138,7 @@ namespace osu.Game.Rulesets.Mania.Tests
                                 content = new Container { RelativeSizeAxes = Axes.Both }
                             }
                         },
-                        new SpriteText
+                        new OsuSpriteText
                         {
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.TopCentre,
@@ -168,11 +168,13 @@ namespace osu.Game.Rulesets.Mania.Tests
                     foreach (var nested in obj.NestedHitObjects)
                     {
                         double finalPosition = (nested.HitObject.StartTime - obj.HitObject.StartTime) / endTime.Duration;
+
                         switch (direction)
                         {
                             case ScrollingDirection.Up:
                                 nested.Y = (float)(finalPosition * content.DrawHeight);
                                 break;
+
                             case ScrollingDirection.Down:
                                 nested.Y = (float)(-finalPosition * content.DrawHeight);
                                 break;

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

@@ -22,7 +22,7 @@ using osuTK;
 namespace osu.Game.Rulesets.Mania.Tests
 {
     [TestFixture]
-    public class TestCaseStage : ManiaInputTestCase
+    public class TestSceneStage : ManiaInputTestScene
     {
         private const int columns = 4;
 
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
         private FillFlowContainer<ScrollingTestContainer> fill;
 
-        public TestCaseStage()
+        public TestSceneStage()
             : base(columns)
         {
         }

osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj

@@ -2,8 +2,8 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
-    <PackageReference Include="NUnit" Version="3.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>

osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs

@@ -48,6 +48,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
             if (IsForCurrentRuleset)
             {
                 TargetColumns = (int)Math.Max(1, roundedCircleSize);
+
                 if (TargetColumns >= 10)
                 {
                     TargetColumns = TargetColumns / 2;

osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs

@@ -179,6 +179,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             int usableColumns = TotalColumns - RandomStart - PreviousPattern.ColumnWithObjects;
             int nextColumn = GetRandomColumn();
+
             for (int i = 0; i < Math.Min(usableColumns, noteCount); i++)
             {
                 // Find available column
@@ -217,6 +218,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                 nextColumn = FindAvailableColumn(nextColumn, PreviousPattern);
 
             int lastColumn = nextColumn;
+
             for (int i = 0; i < noteCount; i++)
             {
                 addToPattern(pattern, nextColumn, startTime, startTime);
@@ -299,6 +301,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             int interval = Random.Next(1, TotalColumns - (legacy ? 1 : 0));
 
             int nextColumn = GetColumn((HitObject as IHasXPosition)?.X ?? 0, true);
+
             for (int i = 0; i <= spanCount; i++)
             {
                 addToPattern(pattern, nextColumn, startTime, startTime);
@@ -341,16 +344,19 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                     p3 = 0;
                     p4 = 0;
                     break;
+
                 case 3:
                     p2 = Math.Min(p2, 0.1);
                     p3 = 0;
                     p4 = 0;
                     break;
+
                 case 4:
                     p2 = Math.Min(p2, 0.3);
                     p3 = Math.Min(p3, 0.04);
                     p4 = 0;
                     break;
+
                 case 5:
                     p2 = Math.Min(p2, 0.34);
                     p3 = Math.Min(p3, 0.1);
@@ -440,6 +446,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             bool ignoreHead = !sampleInfoListAt(startTime).Any(s => s.Name == SampleInfo.HIT_WHISTLE || s.Name == SampleInfo.HIT_FINISH || s.Name == SampleInfo.HIT_CLAP);
 
             var rowPattern = new Pattern();
+
             for (int i = 0; i <= spanCount; i++)
             {
                 if (!(ignoreHead && startTime == HitObject.StartTime))

osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs

@@ -38,9 +38,11 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                 case 8 when HitObject.Samples.Any(s => s.Name == SampleInfo.HIT_FINISH) && endTime - HitObject.StartTime < 1000:
                     addToPattern(pattern, 0, generateHold);
                     break;
+
                 case 8:
                     addToPattern(pattern, FindAvailableColumn(GetRandomColumn(), PreviousPattern), generateHold);
                     break;
+
                 default:
                     if (TotalColumns > 0)
                         addToPattern(pattern, GetRandomColumn(), generateHold);

osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs

@@ -233,6 +233,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                 noteCount = Math.Min(noteCount, TotalColumns - RandomStart - PreviousPattern.ColumnWithObjects);
 
             int nextColumn = GetColumn((HitObject as IHasXPosition)?.X ?? 0, true);
+
             for (int i = 0; i < noteCount; i++)
             {
                 nextColumn = allowStacking
@@ -303,6 +304,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             int columnLimit = (TotalColumns % 2 == 0 ? TotalColumns : TotalColumns - 1) / 2;
             int nextColumn = GetRandomColumn(upperBound: columnLimit);
+
             for (int i = 0; i < noteCount; i++)
             {
                 nextColumn = FindAvailableColumn(nextColumn, upperBound: columnLimit, patterns: pattern);
@@ -340,18 +342,21 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                     p4 = 0;
                     p5 = 0;
                     break;
+
                 case 3:
                     p2 = Math.Min(p2, 0.1);
                     p3 = 0;
                     p4 = 0;
                     p5 = 0;
                     break;
+
                 case 4:
                     p2 = Math.Min(p2, 0.23);
                     p3 = Math.Min(p3, 0.04);
                     p4 = 0;
                     p5 = 0;
                     break;
+
                 case 5:
                     p3 = Math.Min(p3, 0.15);
                     p4 = Math.Min(p4, 0.03);
@@ -384,20 +389,24 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                     p2 = 0;
                     p3 = 0;
                     break;
+
                 case 3:
                     centreProbability = Math.Min(centreProbability, 0.03);
                     p2 = 0;
                     p3 = 0;
                     break;
+
                 case 4:
                     centreProbability = 0;
                     p2 = Math.Min(p2 * 2, 0.2);
                     p3 = 0;
                     break;
+
                 case 5:
                     centreProbability = Math.Min(centreProbability, 0.03);
                     p3 = 0;
                     break;
+
                 case 6:
                     centreProbability = 0;
                     p2 = Math.Min(p2 * 2, 0.5);

osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/PatternGenerator.cs

@@ -158,6 +158,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             // Ensure that we have at least one free column, so that an endless loop is avoided
             bool hasValidColumns = false;
+
             for (int i = lowerBound.Value; i < upperBound.Value; i++)
             {
                 hasValidColumns = isValid(i);

osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs

@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty
         protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
         {
             if (beatmap.HitObjects.Count == 0)
-                return new ManiaDifficultyAttributes { Mods = mods };
+                return new ManiaDifficultyAttributes { Mods = mods, Skills = skills };
 
             return new ManiaDifficultyAttributes
             {
@@ -38,6 +38,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty
                 Mods = mods,
                 // Todo: This int cast is temporary to achieve 1:1 results with osu!stable, and should be removed in the future
                 GreatHitWindow = (int)(beatmap.HitObjects.First().HitWindows.Great / 2) / clockRate,
+                Skills = skills
             };
         }
 

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

@@ -66,6 +66,7 @@ namespace osu.Game.Rulesets.Mania.Edit
             {
                 case DrawableNote note:
                     return new NoteSelectionBlueprint(note);
+
                 case DrawableHoldNote holdNote:
                     return new HoldNoteSelectionBlueprint(holdNote);
             }

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

@@ -17,6 +17,7 @@ namespace osu.Game.Rulesets.Mania.Judgements
             {
                 case HitResult.Miss:
                     return 0;
+
                 default:
                     return 0.040;
             }

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

@@ -14,12 +14,16 @@ namespace osu.Game.Rulesets.Mania.Judgements
             {
                 default:
                     return 0;
+
                 case HitResult.Meh:
                     return 50;
+
                 case HitResult.Ok:
                     return 100;
+
                 case HitResult.Good:
                     return 200;
+
                 case HitResult.Great:
                 case HitResult.Perfect:
                     return 300;
@@ -32,16 +36,22 @@ namespace osu.Game.Rulesets.Mania.Judgements
             {
                 case HitResult.Miss:
                     return -0.125;
+
                 case HitResult.Meh:
                     return 0.005;
+
                 case HitResult.Ok:
                     return 0.010;
+
                 case HitResult.Good:
                     return 0.035;
+
                 case HitResult.Great:
                     return 0.055;
+
                 case HitResult.Perfect:
                     return 0.065;
+
                 default:
                     return 0;
             }

osu.Game.Rulesets.Mania/ManiaRuleset.cs

@@ -117,6 +117,7 @@ namespace osu.Game.Rulesets.Mania
                         new ManiaModNoFail(),
                         new MultiMod(new ManiaModHalfTime(), new ManiaModDaycore()),
                     };
+
                 case ModType.DifficultyIncrease:
                     return new Mod[]
                     {
@@ -126,6 +127,7 @@ namespace osu.Game.Rulesets.Mania
                         new MultiMod(new ManiaModFadeIn(), new ManiaModHidden()),
                         new ManiaModFlashlight(),
                     };
+
                 case ModType.Conversion:
                     return new Mod[]
                     {
@@ -142,16 +144,19 @@ namespace osu.Game.Rulesets.Mania
                         new ManiaModDualStages(),
                         new ManiaModMirror(),
                     };
+
                 case ModType.Automation:
                     return new Mod[]
                     {
                         new MultiMod(new ManiaModAutoplay(), new ModCinema()),
                     };
+
                 case ModType.Fun:
                     return new Mod[]
                     {
                         new MultiMod(new ModWindUp<ManiaHitObject>(), new ModWindDown<ManiaHitObject>())
                     };
+
                 default:
                     return new Mod[] { };
             }
@@ -214,6 +219,7 @@ namespace osu.Game.Rulesets.Mania
                         SpecialAction = ManiaAction.Special1,
                         NormalActionStart = ManiaAction.Key1,
                     }.GenerateKeyBindingsFor(variant, out _);
+
                 case PlayfieldType.Dual:
                     int keys = getDualStageKeyCount(variant);
 
@@ -271,6 +277,7 @@ namespace osu.Game.Rulesets.Mania
             {
                 default:
                     return $"{variant}K";
+
                 case PlayfieldType.Dual:
                 {
                     var keys = getDualStageKeyCount(variant);

osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs

@@ -65,6 +65,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                 case ArmedState.Miss:
                     this.FadeOut(150, Easing.In).Expire();
                     break;
+
                 case ArmedState.Hit:
                     this.FadeOut(150, Easing.OutQuint).Expire();
                     break;

osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/BodyPiece.cs

@@ -145,6 +145,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
             const float animation_length = 50;
 
             Foreground.ClearTransforms(false, nameof(Foreground.Colour));
+
             if (hitting)
             {
                 // wait for the next sync point

osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs

@@ -28,6 +28,7 @@ namespace osu.Game.Rulesets.Mania.Replays
             var normalAction = ManiaAction.Key1;
             var specialAction = ManiaAction.Special1;
             int totalCounter = 0;
+
             foreach (var stage in Beatmap.Stages)
             {
                 for (int i = 0; i < stage.Columns; i++)
@@ -51,6 +52,7 @@ namespace osu.Game.Rulesets.Mania.Replays
             var pointGroups = generateActionPoints().GroupBy(a => a.Time).OrderBy(g => g.First().Time);
 
             var actions = new List<ManiaAction>();
+
             foreach (var group in pointGroups)
             {
                 foreach (var point in group)
@@ -60,6 +62,7 @@ namespace osu.Game.Rulesets.Mania.Replays
                         case HitPoint _:
                             actions.Add(columnActions[point.Column]);
                             break;
+
                         case ReleasePoint _:
                             actions.Remove(columnActions[point.Column]);
                             break;

osu.Game.Rulesets.Mania/Replays/ManiaReplayFrame.cs

@@ -39,6 +39,7 @@ namespace osu.Game.Rulesets.Mania.Replays
 
             int activeColumns = (int)(legacyFrame.MouseX ?? 0);
             int counter = 0;
+
             while (activeColumns > 0)
             {
                 var isSpecial = stage.IsSpecialColumn(counter);

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

@@ -57,6 +57,7 @@ namespace osu.Game.Rulesets.Mania.UI
                 double endTime = i < timingPoints.Count - 1 ? timingPoints[i + 1].Time - point.BeatLength : lastObjectTime + point.BeatLength * (int)point.TimeSignature;
 
                 int index = 0;
+
                 for (double t = timingPoints[i].Time; Precision.DefinitelyBigger(endTime, t); t += point.BeatLength, index++)
                 {
                     barLines.Add(new BarLine
@@ -105,8 +106,10 @@ namespace osu.Game.Rulesets.Mania.UI
             {
                 case HoldNote holdNote:
                     return new DrawableHoldNote(holdNote);
+
                 case Note note:
                     return new DrawableNote(note);
+
                 default:
                     return null;
             }

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

@@ -38,6 +38,7 @@ namespace osu.Game.Rulesets.Mania.UI
             var normalColumnAction = ManiaAction.Key1;
             var specialColumnAction = ManiaAction.Special1;
             int firstColumnIndex = 0;
+
             for (int i = 0; i < stageDefinitions.Count; i++)
             {
                 var newStage = new ManiaStage(firstColumnIndex, stageDefinitions[i], ref normalColumnAction, ref specialColumnAction);
@@ -92,6 +93,7 @@ namespace osu.Game.Rulesets.Mania.UI
         private ManiaStage getStageByColumn(int column)
         {
             int sum = 0;
+
             foreach (var stage in stages)
             {
                 sum = sum + stage.Columns.Count;

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

@@ -35,6 +35,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                         yield return createConvertValue(nested);
 
                     break;
+
                 default:
                     yield return createConvertValue(hitObject);
 

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

@@ -7,9 +7,9 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestCaseEditor : EditorTestCase
+    public class TestSceneEditor : EditorTestScene
     {
-        public TestCaseEditor()
+        public TestSceneEditor()
             : base(new OsuRuleset())
         {
         }

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

@@ -15,7 +15,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestCaseGameplayCursor : OsuTestCase, IProvideCursor
+    public class TestSceneGameplayCursor : OsuTestScene, IProvideCursor
     {
         private GameplayCursorContainer cursorContainer;
 

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

@@ -19,7 +19,7 @@ using osu.Game.Rulesets.Scoring;
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestCaseHitCircle : OsuTestCase
+    public class TestSceneHitCircle : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private int depthIndex;
 
-        public TestCaseHitCircle()
+        public TestSceneHitCircle()
         {
             base.Content.Add(content = new OsuInputManager(new RulesetInfo { ID = 0 }));
 

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

@@ -10,11 +10,11 @@ using osu.Game.Rulesets.Osu.Mods;
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestCaseHitCircleHidden : TestCaseHitCircle
+    public class TestSceneHitCircleHidden : TestSceneHitCircle
     {
         public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[] { typeof(OsuModHidden) }).ToList();
 
-        public TestCaseHitCircleHidden()
+        public TestSceneHitCircleHidden()
         {
             Mods.Value = new[] { new OsuModHidden() };
         }

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

@@ -10,21 +10,21 @@ using osuTK;
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestCaseHitCircleLongCombo : PlayerTestCase
+    public class TestSceneHitCircleLongCombo : PlayerTestScene
     {
-        public TestCaseHitCircleLongCombo()
+        public TestSceneHitCircleLongCombo()
             : base(new OsuRuleset())
         {
         }
 
-        protected override IBeatmap CreateBeatmap(Ruleset ruleset)
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {
             var beatmap = new Beatmap
             {
                 BeatmapInfo = new BeatmapInfo
                 {
                     BaseDifficulty = new BeatmapDifficulty { CircleSize = 6 },
-                    Ruleset = ruleset.RulesetInfo
+                    Ruleset = ruleset
                 }
             };
 

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

@@ -11,7 +11,7 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public class TestCaseHitCirclePlacementBlueprint : PlacementBlueprintTestCase
+    public class TestSceneHitCirclePlacementBlueprint : PlacementBlueprintTestScene
     {
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableHitCircle((HitCircle)hitObject);
         protected override PlacementBlueprint CreateBlueprint() => new HitCirclePlacementBlueprint();

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

@@ -12,11 +12,11 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public class TestCaseHitCircleSelectionBlueprint : SelectionBlueprintTestCase
+    public class TestSceneHitCircleSelectionBlueprint : SelectionBlueprintTestScene
     {
         private readonly DrawableHitCircle drawableObject;
 
-        public TestCaseHitCircleSelectionBlueprint()
+        public TestSceneHitCircleSelectionBlueprint()
         {
             var hitCircle = new HitCircle { Position = new Vector2(256, 192) };
             hitCircle.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = 2 });

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

@@ -0,0 +1,19 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Screens.Play;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    public class TestSceneOsuFlashlight : TestSceneOsuPlayer
+    {
+        protected override Player CreatePlayer(Ruleset ruleset)
+        {
+            Mods.Value = new Mod[] { new OsuModAutoplay(), new OsuModFlashlight(), };
+
+            return base.CreatePlayer(ruleset);
+        }
+    }
+}

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

@@ -7,9 +7,9 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestCaseOsuPlayer : PlayerTestCase
+    public class TestSceneOsuPlayer : PlayerTestScene
     {
-        public TestCaseOsuPlayer()
+        public TestSceneOsuPlayer()
             : base(new OsuRuleset())
         {
         }

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

@@ -12,14 +12,14 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public class TestCaseResumeOverlay : ManualInputManagerTestCase
+    public class TestSceneResumeOverlay : ManualInputManagerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(OsuResumeOverlay),
         };
 
-        public TestCaseResumeOverlay()
+        public TestSceneResumeOverlay()
         {
             ManualOsuInputManager osuInputManager;
             CursorContainer cursor;
@@ -46,11 +46,11 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             AddStep("move mouse away", () => InputManager.MoveMouseTo(ScreenSpaceDrawQuad.TopLeft));
             AddStep("click", () => osuInputManager.GameClick());
-            AddAssert("not dismissed", () => !resumeFired && resume.State == Visibility.Visible);
+            AddAssert("not dismissed", () => !resumeFired && resume.State.Value == Visibility.Visible);
 
             AddStep("move mouse back", () => InputManager.MoveMouseTo(ScreenSpaceDrawQuad.Centre));
             AddStep("click", () => osuInputManager.GameClick());
-            AddAssert("dismissed", () => resumeFired && resume.State == Visibility.Hidden);
+            AddAssert("dismissed", () => resumeFired && resume.State.Value == Visibility.Hidden);
         }
 
         private class ManualOsuInputManager : OsuInputManager

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

@@ -7,7 +7,7 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public class TestCaseShaking : TestCaseHitCircle
+    public class TestSceneShaking : TestSceneHitCircle
     {
         public override void Add(Drawable drawable)
         {

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

@@ -27,7 +27,7 @@ using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestCaseSlider : OsuTestCase
+    public class TestSceneSlider : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private int depthIndex;
 
-        public TestCaseSlider()
+        public TestSceneSlider()
         {
             base.Content.Add(content = new OsuInputManager(new RulesetInfo { ID = 0 }));
 

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

@@ -10,11 +10,11 @@ using osu.Game.Rulesets.Osu.Mods;
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestCaseSliderHidden : TestCaseSlider
+    public class TestSceneSliderHidden : TestSceneSlider
     {
         public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[] { typeof(OsuModHidden) }).ToList();
 
-        public TestCaseSliderHidden()
+        public TestSceneSliderHidden()
         {
             Mods.Value = new[] { new OsuModHidden() };
         }

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

@@ -20,13 +20,12 @@ using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
-using osu.Game.Tests.Beatmaps;
 using osu.Game.Tests.Visual;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public class TestCaseSliderInput : RateAdjustedBeatmapTestCase
+    public class TestSceneSliderInput : RateAdjustedBeatmapTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -299,7 +298,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             AddStep("load player", () =>
             {
-                Beatmap.Value = new TestWorkingBeatmap(new Beatmap<OsuHitObject>
+                Beatmap.Value = CreateWorkingBeatmap(new Beatmap<OsuHitObject>
                 {
                     HitObjects =
                     {
@@ -323,7 +322,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                         BaseDifficulty = new BeatmapDifficulty { SliderTickRate = 3 },
                         Ruleset = new OsuRuleset().RulesetInfo
                     },
-                }, Clock);
+                });
 
                 var p = new ScoreAccessibleReplayPlayer(new Score { Replay = new Replay { Frames = frames } });
 
@@ -353,6 +352,8 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
 
+            protected override bool PauseOnFocusLost => false;
+
             public ScoreAccessibleReplayPlayer(Score score)
                 : base(score, false, false)
             {

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

@@ -11,7 +11,7 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public class TestCaseSliderPlacementBlueprint : PlacementBlueprintTestCase
+    public class TestSceneSliderPlacementBlueprint : PlacementBlueprintTestScene
     {
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableSlider((Slider)hitObject);
         protected override PlacementBlueprint CreateBlueprint() => new SliderPlacementBlueprint();

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

@@ -17,7 +17,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public class TestCaseSliderSelectionBlueprint : SelectionBlueprintTestCase
+    public class TestSceneSliderSelectionBlueprint : SelectionBlueprintTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private readonly DrawableSlider drawableObject;
 
-        public TestCaseSliderSelectionBlueprint()
+        public TestSceneSliderSelectionBlueprint()
         {
             var slider = new Slider
             {

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

@@ -18,7 +18,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestCaseSpinner : OsuTestCase
+    public class TestSceneSpinner : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private int depthIndex;
 
-        public TestCaseSpinner()
+        public TestSceneSpinner()
         {
             base.Content.Add(content = new OsuInputManager(new RulesetInfo { ID = 0 }));
 

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

@@ -10,11 +10,11 @@ using osu.Game.Rulesets.Osu.Mods;
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestCaseSpinnerHidden : TestCaseSpinner
+    public class TestSceneSpinnerHidden : TestSceneSpinner
     {
         public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[] { typeof(OsuModHidden) }).ToList();
 
-        public TestCaseSpinnerHidden()
+        public TestSceneSpinnerHidden()
         {
             Mods.Value = new[] { new OsuModHidden() };
         }

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

@@ -11,7 +11,7 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public class TestCaseSpinnerPlacementBlueprint : PlacementBlueprintTestCase
+    public class TestSceneSpinnerPlacementBlueprint : PlacementBlueprintTestScene
     {
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableSpinner((Spinner)hitObject);
 

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

@@ -17,7 +17,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public class TestCaseSpinnerSelectionBlueprint : SelectionBlueprintTestCase
+    public class TestSceneSpinnerSelectionBlueprint : SelectionBlueprintTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private readonly DrawableSpinner drawableSpinner;
 
-        public TestCaseSpinnerSelectionBlueprint()
+        public TestSceneSpinnerSelectionBlueprint()
         {
             var spinner = new Spinner
             {

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

@@ -2,8 +2,8 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
-    <PackageReference Include="NUnit" Version="3.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>

osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapProcessor.cs

@@ -44,12 +44,14 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
             if (endIndex < 0) throw new ArgumentOutOfRangeException(nameof(endIndex), $"{nameof(endIndex)} cannot be less than 0.");
 
             int extendedEndIndex = endIndex;
+
             if (endIndex < beatmap.HitObjects.Count - 1)
             {
                 // Extend the end index to include objects they are stacked on
                 for (int i = endIndex; i >= startIndex; i--)
                 {
                     int stackBaseIndex = i;
+
                     for (int n = stackBaseIndex + 1; n < beatmap.HitObjects.Count; n++)
                     {
                         OsuHitObject stackBaseObject = beatmap.HitObjects[stackBaseIndex];
@@ -67,7 +69,7 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
                             break;
 
                         if (Vector2Extensions.Distance(stackBaseObject.Position, objectN.Position) < stack_distance
-                            || stackBaseObject is Slider && Vector2Extensions.Distance(stackBaseObject.EndPosition, objectN.Position) < stack_distance)
+                            || (stackBaseObject is Slider && Vector2Extensions.Distance(stackBaseObject.EndPosition, objectN.Position) < stack_distance))
                         {
                             stackBaseIndex = n;
 
@@ -87,6 +89,7 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
 
             //Reverse pass for stack calculation.
             int extendedStartIndex = startIndex;
+
             for (int i = extendedEndIndex; i > startIndex; i--)
             {
                 int n = i;
@@ -138,6 +141,7 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
                         if (objectN is Slider && Vector2Extensions.Distance(objectN.EndPosition, objectI.Position) < stack_distance)
                         {
                             int offset = objectI.StackHeight - objectN.StackHeight + 1;
+
                             for (int j = n + 1; j <= i; j++)
                             {
                                 //For each object which was declared under this slider, we will offset it to appear *below* the slider end (rather than above).

osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs

@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
         protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
         {
             if (beatmap.HitObjects.Count == 0)
-                return new OsuDifficultyAttributes { Mods = mods };
+                return new OsuDifficultyAttributes { Mods = mods, Skills = skills };
 
             double aimRating = Math.Sqrt(skills[0].DifficultyValue()) * difficulty_multiplier;
             double speedRating = Math.Sqrt(skills[1].DifficultyValue()) * difficulty_multiplier;
@@ -50,7 +50,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                 SpeedStrain = speedRating,
                 ApproachRate = preempt > 1200 ? (1800 - preempt) / 120 : (1200 - preempt) / 150 + 5,
                 OverallDifficulty = (80 - hitWindowGreat) / 6,
-                MaxCombo = maxCombo
+                MaxCombo = maxCombo,
+                Skills = skills
             };
         }
 

osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs

@@ -109,6 +109,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                 aimValue *= Math.Min(Math.Pow(scoreMaxCombo, 0.8f) / Math.Pow(beatmapMaxCombo, 0.8f), 1.0f);
 
             double approachRateFactor = 1.0f;
+
             if (Attributes.ApproachRate > 10.33f)
                 approachRateFactor += 0.3f * (Attributes.ApproachRate - 10.33f);
             else if (Attributes.ApproachRate < 8.0f)

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

@@ -56,6 +56,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
         {
             // We will scale distances by this factor, so we can assume a uniform CircleSize among beatmaps.
             float scalingFactor = normalized_radius / (float)BaseObject.Radius;
+
             if (BaseObject.Radius < 30)
             {
                 float smallCircleBonus = Math.Min(30 - (float)BaseObject.Radius, 5) / 50;

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

@@ -42,9 +42,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
                 speedBonus = 1 + Math.Pow((min_speed_bonus - deltaTime) / speed_balancing_factor, 2);
 
             double angleBonus = 1.0;
+
             if (osuCurrent.Angle != null && osuCurrent.Angle.Value < angle_bonus_begin)
             {
                 angleBonus = 1 + Math.Pow(Math.Sin(1.5 * (angle_bonus_begin - osuCurrent.Angle.Value)), 2) / 3.57;
+
                 if (osuCurrent.Angle.Value < pi_over_2)
                 {
                     angleBonus = 1.28;

osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderCirclePiece.cs

@@ -37,6 +37,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                 case SliderPosition.Start:
                     Position = slider.StackedPosition + slider.Path.PositionAt(0);
                     break;
+
                 case SliderPosition.End:
                     Position = slider.StackedPosition + slider.Path.PositionAt(1);
                     break;

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

@@ -62,6 +62,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                 case PlacementState.Initial:
                     HitObject.Position = e.MousePosition;
                     return true;
+
                 case PlacementState.Body:
                     cursor = e.MousePosition - HitObject.Position;
                     return true;
@@ -77,6 +78,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                 case PlacementState.Initial:
                     beginCurve();
                     break;
+
                 case PlacementState.Body:
                     switch (e.Button)
                     {

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

@@ -42,8 +42,10 @@ namespace osu.Game.Rulesets.Osu.Edit
             {
                 case DrawableHitCircle circle:
                     return new HitCircleSelectionBlueprint(circle);
+
                 case DrawableSlider slider:
                     return new SliderSelectionBlueprint(slider);
+
                 case DrawableSpinner spinner:
                     return new SpinnerSelectionBlueprint(spinner);
             }

osu.Game.Rulesets.Osu/Judgements/OsuJudgement.cs

@@ -16,10 +16,13 @@ namespace osu.Game.Rulesets.Osu.Judgements
             {
                 default:
                     return 0;
+
                 case HitResult.Meh:
                     return 50;
+
                 case HitResult.Good:
                     return 100;
+
                 case HitResult.Great:
                     return 300;
             }
@@ -31,10 +34,12 @@ namespace osu.Game.Rulesets.Osu.Judgements
             {
                 case HitResult.Miss:
                     return -0.02;
+
                 case HitResult.Meh:
                 case HitResult.Good:
                 case HitResult.Great:
                     return 0.01;
+
                 default:
                     return 0;
             }

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

@@ -1,23 +1,38 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
+using osu.Framework.MathUtils;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModFlashlight : ModFlashlight<OsuHitObject>
+    public class OsuModFlashlight : ModFlashlight<OsuHitObject>, IApplicableToDrawableHitObjects
     {
         public override double ScoreMultiplier => 1.12;
 
         private const float default_flashlight_size = 180;
 
-        public override Flashlight CreateFlashlight() => new OsuFlashlight();
+        private OsuFlashlight flashlight;
+
+        public override Flashlight CreateFlashlight() => flashlight = new OsuFlashlight();
+
+        public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
+        {
+            foreach (var s in drawables.OfType<DrawableSlider>())
+            {
+                s.Tracking.ValueChanged += flashlight.OnSliderTrackingChange;
+            }
+        }
 
         private class OsuFlashlight : Flashlight, IRequireHighFrequencyMousePosition
         {
@@ -26,9 +41,22 @@ namespace osu.Game.Rulesets.Osu.Mods
                 FlashlightSize = new Vector2(0, getSizeFor(0));
             }
 
+            public void OnSliderTrackingChange(ValueChangedEvent<bool> e)
+            {
+                // If a slider is in a tracking state, a further dim should be applied to the (remaining) visible portion of the playfield over a brief duration.
+                this.TransformTo(nameof(FlashlightDim), e.NewValue ? 0.8f : 0.0f, 50);
+            }
+
             protected override bool OnMouseMove(MouseMoveEvent e)
             {
-                FlashlightPosition = e.MousePosition;
+                const double follow_delay = 120;
+
+                var position = FlashlightPosition;
+                var destination = e.MousePosition;
+
+                FlashlightPosition = Interpolation.ValueAt(
+                    MathHelper.Clamp(Clock.ElapsedFrameTime, 0, follow_delay), position, destination, 0, follow_delay, Easing.Out);
+
                 return base.OnMouseMove(e);
             }
 

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

@@ -2,8 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
@@ -11,7 +14,7 @@ using osu.Game.Rulesets.Osu.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    internal class OsuModGrow : Mod, IApplicableToDrawableHitObjects
+    internal class OsuModGrow : Mod, IReadFromConfig, IApplicableToDrawableHitObjects
     {
         public override string Name => "Grow";
 
@@ -25,14 +28,22 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override double ScoreMultiplier => 1;
 
+        private Bindable<bool> increaseFirstObjectVisibility = new Bindable<bool>();
+
+        public void ReadFromConfig(OsuConfigManager config)
+        {
+            increaseFirstObjectVisibility = config.GetBindable<bool>(OsuSetting.IncreaseFirstObjectVisibility);
+        }
+
         public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
         {
-            foreach (var drawable in drawables)
+            foreach (var drawable in drawables.Skip(increaseFirstObjectVisibility.Value ? 1 : 0))
             {
                 switch (drawable)
                 {
                     case DrawableSpinner _:
                         continue;
+
                     default:
                         drawable.ApplyCustomUpdateState += ApplyCustomState;
                         break;
@@ -51,6 +62,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                 case DrawableSliderTail _:
                     // special cases we should *not* be scaling.
                     break;
+
                 case DrawableSlider _:
                 case DrawableHitCircle _:
                 {

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

@@ -59,11 +59,13 @@ namespace osu.Game.Rulesets.Osu.Mods
                         circle.FadeOut(fadeOutDuration);
 
                     break;
+
                 case DrawableSlider slider:
                     using (slider.BeginAbsoluteSequence(fadeOutStartTime, true))
                         slider.Body.FadeOut(longFadeDuration, Easing.Out);
 
                     break;
+
                 case DrawableSliderTick sliderTick:
                     // slider ticks fade out over up to one second
                     var tickFadeOutDuration = Math.Min(sliderTick.HitObject.TimePreempt - DrawableSliderTick.ANIM_DURATION, 1000);
@@ -72,6 +74,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                         sliderTick.FadeOut(tickFadeOutDuration);
 
                     break;
+
                 case DrawableSpinner spinner:
                     // hide elements we don't care about.
                     spinner.Disc.Hide();

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

@@ -37,11 +37,11 @@ namespace osu.Game.Rulesets.Osu.Mods
 
                 if (time < osuHit.HitObject.StartTime - relax_leniency) continue;
 
-                if (osuHit.HitObject is IHasEndTime hasEnd && time > hasEnd.EndTime || osuHit.IsHit)
+                if ((osuHit.HitObject is IHasEndTime hasEnd && time > hasEnd.EndTime) || osuHit.IsHit)
                     continue;
 
                 requiresHit |= osuHit is DrawableHitCircle && osuHit.IsHovered && osuHit.HitObject.HitWindows.CanBeHit(relativetime);
-                requiresHold |= osuHit is DrawableSlider slider && (slider.Ball.IsHovered || osuHit.IsHovered) || osuHit is DrawableSpinner;
+                requiresHold |= (osuHit is DrawableSlider slider && (slider.Ball.IsHovered || osuHit.IsHovered)) || osuHit is DrawableSpinner;
             }
 
             if (requiresHit)

osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs

@@ -67,6 +67,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
                 return;
 
             OsuHitObject prevHitObject = null;
+
             foreach (var currHitObject in hitObjects)
             {
                 if (prevHitObject != null && !currHitObject.NewCombo && !(prevHitObject is Spinner) && !(currHitObject is Spinner))

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs

@@ -124,6 +124,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
 
             var result = HitObject.HitWindows.ResultFor(timeOffset);
+
             if (result == HitResult.None)
             {
                 Shake(Math.Abs(timeOffset) - HitObject.HitWindows.HalfWindowFor(HitResult.Miss));
@@ -158,11 +159,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     // override lifetime end as FadeIn may have been changed externally, causing out expiration to be too early.
                     LifetimeEnd = HitObject.StartTime + HitObject.HitWindows.HalfWindowFor(HitResult.Miss);
                     break;
+
                 case ArmedState.Miss:
                     ApproachCircle.FadeOut(50);
                     this.FadeOut(100);
                     Expire();
                     break;
+
                 case ArmedState.Hit:
                     ApproachCircle.FadeOut(50);
 

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableRepeatPoint.cs

@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             if (repeatPoint.StartTime <= Time.Current)
-                ApplyResult(r => r.Type = drawableSlider.Tracking ? HitResult.Great : HitResult.Miss);
+                ApplyResult(r => r.Type = drawableSlider.Tracking.Value ? HitResult.Great : HitResult.Miss);
         }
 
         protected override void UpdatePreemptState()
@@ -64,9 +64,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 case ArmedState.Idle:
                     this.Delay(HitObject.TimePreempt).FadeOut();
                     break;
+
                 case ArmedState.Miss:
                     this.FadeOut(animDuration);
                     break;
+
                 case ArmedState.Hit:
                     this.FadeOut(animDuration, Easing.OutQuint)
                         .ScaleTo(Scale * 1.5f, animDuration, Easing.Out);

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs

@@ -130,13 +130,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
-        public bool Tracking;
+        public readonly Bindable<bool> Tracking = new Bindable<bool>();
 
         protected override void Update()
         {
             base.Update();
 
-            Tracking = Ball.Tracking;
+            Tracking.Value = Ball.Tracking;
 
             double completionProgress = MathHelper.Clamp((Time.Current - slider.StartTime) / slider.Duration, 0, 1);
 
@@ -160,9 +160,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.SkinChanged(skin, allowFallback);
 
-            Body.AccentColour = skin.GetValue<SkinConfiguration, Color4?>(s => s.CustomColours.ContainsKey("SliderTrackOverride") ? s.CustomColours["SliderTrackOverride"] : (Color4?)null) ?? Body.AccentColour;
-            Body.BorderColour = skin.GetValue<SkinConfiguration, Color4?>(s => s.CustomColours.ContainsKey("SliderBorder") ? s.CustomColours["SliderBorder"] : (Color4?)null) ?? Body.BorderColour;
-            Ball.AccentColour = skin.GetValue<SkinConfiguration, Color4?>(s => s.CustomColours.ContainsKey("SliderBall") ? s.CustomColours["SliderBall"] : (Color4?)null) ?? Ball.AccentColour;
+            Body.BorderSize = skin.GetValue<SkinConfiguration, float?>(s => s.SliderBorderSize) ?? SliderBody.DEFAULT_BORDER_SIZE;
+            Body.AccentColour = skin.GetValue<SkinConfiguration, Color4?>(s => s.CustomColours.ContainsKey("SliderTrackOverride") ? s.CustomColours["SliderTrackOverride"] : (Color4?)null) ?? AccentColour;
+            Body.BorderColour = skin.GetValue<SkinConfiguration, Color4?>(s => s.CustomColours.ContainsKey("SliderBorder") ? s.CustomColours["SliderBorder"] : (Color4?)null) ?? Color4.White;
+            Ball.AccentColour = skin.GetValue<SkinConfiguration, Color4?>(s => s.CustomColours.ContainsKey("SliderBall") ? s.CustomColours["SliderBall"] : (Color4?)null) ?? AccentColour;
         }
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)