Merge pull request #2860 from peppy/fix-unauthorized-request

Fix API getting stuck in an endless loop under a certain unauthorized scenario
Merge branch 'master' into fix-unauthorized-request
2026-05-15 07:02:36 +08:00 · 2018-06-26 22:37:50 +09:00 · 2018-06-26 22:25:19 +09:00 · 2018-06-26 20:54:59 +09:00 · 2018-06-26 20:41:08 +09:00 · 2018-06-26 20:34:22 +09:00
448 changed files with 13445 additions and 7016 deletions
@@ -0,0 +1,8 @@
+Add any details pertaining to developers above the break.
+
+- [ ] Depends on #PR
+- Closes #ISSUE
+
+---
+
+Add a sentence or two describing this change in plain english. This will be displayed on the [changelog](https://osu.ppy.sh/home/changelog). A single screenshot or short gif is also welcomed.
@@ -1,6 +1,3 @@
-[submodule "osu-framework"]
-	path = osu-framework
-	url = https://github.com/ppy/osu-framework
 [submodule "osu-resources"]
 	path = osu-resources
-	url = https://github.com/ppy/osu-resources
+	url = https://github.com/ppy/osu-resources
@@ -1,21 +1,17 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="RulesetTests (catch)" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/bin/Debug/net471/osu.Game.Rulesets.Catch.Tests.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/bin/Debug/netcoreapp2.1/osu.Game.Rulesets.Catch.Tests.dll" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests" />
    <option name="PASS_PARENT_ENVS" value="1" />
-    <envs>
-      <env name="ASPNETCORE_ENVIRONMENT" value="Development" />
-      <env name="ASPNETCORE_URLS" value="http://localhost:5000" />
-    </envs>
-    <option name="USE_MONO" value="0" />
    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj" />
    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETFramework,Version=v4.7.1" />
+    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v2.1" />
    <browser url="http://localhost:5000" />
    <method />
  </configuration>
@@ -1,21 +1,17 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="RulesetTests (mania)" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/bin/Debug/net471/osu.Game.Rulesets.Mania.Tests.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/bin/Debug/netcoreapp2.1/osu.Game.Rulesets.Mania.Tests.dll" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests" />
    <option name="PASS_PARENT_ENVS" value="1" />
-    <envs>
-      <env name="ASPNETCORE_ENVIRONMENT" value="Development" />
-      <env name="ASPNETCORE_URLS" value="http://localhost:5000" />
-    </envs>
-    <option name="USE_MONO" value="0" />
    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj" />
    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETFramework,Version=v4.7.1" />
+    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v2.1" />
    <browser url="http://localhost:5000" />
    <method />
  </configuration>
@@ -1,21 +1,17 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="RulesetTests (osu!)" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/bin/Debug/net471/osu.Game.Rulesets.Osu.Tests.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/bin/Debug/netcoreapp2.1/osu.Game.Rulesets.Osu.Tests.dll" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests" />
    <option name="PASS_PARENT_ENVS" value="1" />
-    <envs>
-      <env name="ASPNETCORE_ENVIRONMENT" value="Development" />
-      <env name="ASPNETCORE_URLS" value="http://localhost:5000" />
-    </envs>
-    <option name="USE_MONO" value="0" />
    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj" />
    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETFramework,Version=v4.7.1" />
+    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v2.1" />
    <browser url="http://localhost:5000" />
    <method />
  </configuration>
@@ -1,21 +1,17 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="RulesetTests (taiko)" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/bin/Debug/net471/osu.Game.Rulesets.Taiko.Tests.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/bin/Debug/netcoreapp2.1/osu.Game.Rulesets.Taiko.Tests.dll" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests" />
    <option name="PASS_PARENT_ENVS" value="1" />
-    <envs>
-      <env name="ASPNETCORE_ENVIRONMENT" value="Development" />
-      <env name="ASPNETCORE_URLS" value="http://localhost:5000" />
-    </envs>
-    <option name="USE_MONO" value="0" />
    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj" />
    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETFramework,Version=v4.7.1" />
+    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v2.1" />
    <browser url="http://localhost:5000" />
    <method />
  </configuration>
@@ -1,18 +1,17 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="VisualTests (netcoreapp2.0)" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Tests/bin/Debug/netcoreapp2.0/osu.Game.Tests.dll" />
+  <configuration default="false" name="VisualTests" type="DotNetProject" factoryName=".NET Project">
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Tests/bin/Debug/netcoreapp2.1/osu.Game.Tests.dll" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Tests" />
    <option name="PASS_PARENT_ENVS" value="1" />
-    <envs />
-    <option name="USE_MONO" value="0" />
    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Game.Tests/osu.Game.Tests.csproj" />
    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v2.0" />
+    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v2.1" />
    <method />
  </configuration>
 </component>
@@ -1,18 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="VisualTests (net471)" type="DotNetProject" factoryName=".NET Project" singleton="true">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Tests/bin/Debug/net471/osu.Game.Tests.exe" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Tests" />
-    <option name="PASS_PARENT_ENVS" value="1" />
-    <envs />
-    <option name="USE_MONO" value="0" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
-    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Game.Tests/osu.Game.Tests.csproj" />
-    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
-    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
-    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
-    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETFramework,Version=v4.7.1" />
-    <method />
-  </configuration>
-</component>
@@ -1,18 +1,17 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="osu! (netcoreapp2.0)" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp2.0/osu!.dll" />
+  <configuration default="false" name="osu!" type="DotNetProject" factoryName=".NET Project">
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp2.1/osu!.dll" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop" />
    <option name="PASS_PARENT_ENVS" value="1" />
-    <envs />
-    <option name="USE_MONO" value="0" />
    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Desktop/osu.Desktop.csproj" />
    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v2.0" />
+    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v2.1" />
    <method />
  </configuration>
 </component>
@@ -1,18 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="osu! (net471)" type="DotNetProject" factoryName=".NET Project" singleton="true">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net471/osu!.exe" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop" />
-    <option name="PASS_PARENT_ENVS" value="1" />
-    <envs />
-    <option name="USE_MONO" value="0" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
-    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Desktop/osu.Desktop.csproj" />
-    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
-    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
-    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
-    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETFramework,Version=v4.7.1" />
-    <method />
-  </configuration>
-</component>
@@ -2,110 +2,54 @@
    "version": "0.2.0",
    "configurations": [
        {
-            "name": "VisualTests (Debug, net471)",
-            "windows": {
-                "type": "clr"
-            },
-            "type": "mono",
-            "request": "launch",
-            "program": "${workspaceRoot}/osu.Game.Tests/bin/Debug/net471/osu.Game.Tests.exe",
-            "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Debug, msbuild)",
-            "runtimeExecutable": null,
-            "env": {},
-            "console": "internalConsole"
-        },
-        {
-            "name": "VisualTests (Release, net471)",
-            "windows": {
-                "type": "clr"
-            },
-            "type": "mono",
-            "request": "launch",
-            "program": "${workspaceRoot}/osu.Game.Tests/bin/Debug/net471/osu.Game.Tests.exe",
-            "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Release, msbuild)",
-            "runtimeExecutable": null,
-            "env": {},
-            "console": "internalConsole"
-        },
-        {
-            "name": "osu! (Debug, net471)",
-            "windows": {
-                "type": "clr"
-            },
-            "type": "mono",
-            "request": "launch",
-            "program": "${workspaceRoot}/osu.Desktop/bin/Debug/net471/osu!.exe",
-            "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Debug, msbuild)",
-            "runtimeExecutable": null,
-            "env": {},
-            "console": "internalConsole"
-        },
-        {
-            "name": "osu! (Release, net471)",
-            "windows": {
-                "type": "clr"
-            },
-            "type": "mono",
-            "request": "launch",
-            "program": "${workspaceRoot}/osu.Desktop/bin/Release/net471/osu!.exe",
-            "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Release, msbuild)",
-            "runtimeExecutable": null,
-            "env": {},
-            "console": "internalConsole"
-        },
-        {
-            "name": "VisualTests (Debug, netcoreapp2.0)",
+            "name": "VisualTests (Debug)",
            "type": "coreclr",
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/osu.Game.Tests/bin/Debug/netcoreapp2.0/osu.Game.Tests.dll"
+                "${workspaceRoot}/osu.Game.Tests/bin/Debug/netcoreapp2.1/osu.Game.Tests.dll"
            ],
            "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Debug, dotnet)",
+            "preLaunchTask": "Build tests (Debug)",
            "env": {},
            "console": "internalConsole"
        },
        {
-            "name": "VisualTests (Release, netcoreapp2.0)",
+            "name": "VisualTests (Release)",
            "type": "coreclr",
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/osu.Game.Tests/bin/Debug/netcoreapp2.0/osu.Game.Tests.dll"
+                "${workspaceRoot}/osu.Game.Tests/bin/Release/netcoreapp2.1/osu.Game.Tests.dll"
            ],
            "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Release, dotnet)",
+            "preLaunchTask": "Build tests (Release)",
            "env": {},
            "console": "internalConsole"
        },
        {
-            "name": "osu! (Debug, netcoreapp2.0)",
+            "name": "osu! (Debug)",
            "type": "coreclr",
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/osu.Desktop/bin/Debug/netcoreapp2.0/osu!.dll",
+                "${workspaceRoot}/osu.Desktop/bin/Debug/netcoreapp2.1/osu!.dll",
            ],
            "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Debug, dotnet)",
+            "preLaunchTask": "Build osu! (Debug)",
            "env": {},
            "console": "internalConsole"
        },
        {
-            "name": "osu! (Release, netcoreapp2.0)",
+            "name": "osu! (Release)",
            "type": "coreclr",
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/osu.Desktop/bin/Release/netcoreapp2.0/osu!.dll",
+                "${workspaceRoot}/osu.Desktop/bin/Release/netcoreapp2.1/osu!.dll",
            ],
            "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Release, dotnet)",
+            "preLaunchTask": "Build osu! (Release)",
            "env": {},
            "console": "internalConsole"
        }
@@ -4,41 +4,14 @@
    "version": "2.0.0",
    "tasks": [
        {
-            "label": "Build (Debug, msbuild)",
-            "type": "shell",
-            "command": "msbuild",
-            "args": [
-                "/p:TargetFramework=net471",
-                "/p:GenerateFullPaths=true",
-                "/m",
-                "/verbosity:m"
-            ],
-            "group": "build",
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "Build (Release, msbuild)",
-            "type": "shell",
-            "command": "msbuild",
-            "args": [
-                "/p:Configuration=Release",
-                "/p:TargetFramework=net471",
-                "/p:GenerateFullPaths=true",
-                "/m",
-                "/verbosity:m"
-            ],
-            "group": "build",
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "Build (Debug, dotnet)",
+            "label": "Build osu! (Debug)",
            "type": "shell",
            "command": "dotnet",
            "args": [
                "build",
                "--no-restore",
                "osu.Desktop",
-                "/p:TargetFramework=netcoreapp2.0",
+                "/p:TargetFramework=netcoreapp2.1",
                "/p:GenerateFullPaths=true",
                "/m",
                "/verbosity:m"
@@ -47,14 +20,14 @@
            "problemMatcher": "$msCompile"
        },
        {
-            "label": "Build (Release, dotnet)",
+            "label": "Build osu! (Release)",
            "type": "shell",
            "command": "dotnet",
            "args": [
                "build",
                "--no-restore",
                "osu.Desktop",
-                "/p:TargetFramework=netcoreapp2.0",
+                "/p:TargetFramework=netcoreapp2.1",
                "/p:Configuration=Release",
                "/p:GenerateFullPaths=true",
                "/m",
@@ -64,16 +37,40 @@
            "problemMatcher": "$msCompile"
        },
        {
-            "label": "Restore (net471)",
+            "label": "Build tests (Debug)",
            "type": "shell",
-            "command": "nuget",
+            "command": "dotnet",
            "args": [
-                "restore"
+                "build",
+                "--no-restore",
+                "osu.Game.Tests",
+                "/p:TargetFramework=netcoreapp2.1",
+                "/p:GenerateFullPaths=true",
+                "/m",
+                "/verbosity:m"
            ],
-            "problemMatcher": []
+            "group": "build",
+            "problemMatcher": "$msCompile"
        },
        {
-            "label": "Restore (netcoreapp2.0)",
+            "label": "Build tests (Release)",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "--no-restore",
+                "osu.Game.Tests",
+                "/p:TargetFramework=netcoreapp2.1",
+                "/p:Configuration=Release",
+                "/p:GenerateFullPaths=true",
+                "/m",
+                "/verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Restore (netcoreapp2.1)",
            "type": "shell",
            "command": "dotnet",
            "args": [
@@ -1,36 +0,0 @@
-# Linux
-### 1. Requirements:
-Mono >= 5.4.0 (>= 5.8.0 recommended)
-Please check [here](http://www.mono-project.com/download/) for stable or [here](http://www.mono-project.com/download/alpha/) for an alpha release.  
-NuGet >= 4.4.0  
-msbuild  
-git
-
-### 2. Cloning project
-Clone the entire repository with submodules using
-```
-git clone https://github.com/ppy/osu --recursive
-```
-Then restore NuGet packages from the repository
-```
-nuget restore
-```
-### 3. Compiling
-Simply run `msbuild` where `osu.sln` is located, this will create all binaries in `osu/osu.Desktop/bin/Debug`.
-### 4. Optimizing
-If you want additional performance you can change build type to Release with
-```
-msbuild -p:Configuration=Release
-```
-Additionally, mono provides an AOT utility which attempts to precompile binaries. You can utilize that by running
-```
-mono --aot ./osu\!.exe
-```
-### 5. Troubleshooting
-You may run into trouble with NuGet versioning, as the one in packaging system is almost always out of date. Simply run 
-```
-nuget
-sudo nuget update -self
-```
-**Warning** NuGet creates few config files when it's run for the first time.
-Do not run NuGet as root on the first run or you might run into very peculiar issues.
@@ -2,11 +2,6 @@ clone_depth: 1
 version: '{branch}-{build}'
 image: Visual Studio 2017
 configuration: Debug
-cache:
-  - C:\ProgramData\chocolatey\bin -> appveyor.yml
-  - C:\ProgramData\chocolatey\lib -> appveyor.yml
-  - inspectcode -> appveyor.yml
-  - packages -> **\packages.config
 install:
  - cmd: git submodule update --init --recursive --depth=5
  - cmd: choco install resharper-clt -y
@@ -1,29 +1,24 @@
-branches:
-  only:
-  - release
-skip_tags: true
-skip_branch_with_pr: true
 clone_depth: 1
-version: '{branch}-{build}'
+version: '{build}'
+skip_non_tags: true
 image: Visual Studio 2017
-configuration: Debug
-cache:
-  - packages -> **\packages.config
 install:
-  - cmd: git submodule update --init --recursive --depth=5
+  - git clone https://github.com/ppy/osu-deploy
 before_build:
+  - ps: if($env:appveyor_repo_tag -eq 'True') { Update-AppveyorBuild -Version $env:appveyor_repo_tag_name }
+  - cmd: git submodule update --init --recursive --depth=5
  - cmd: nuget restore -verbosity quiet
-build:
-  project: osu.Desktop.Deploy/osu.Desktop.Deploy.csproj
-  verbosity: minimal
-after_build:
+build_script:
  - ps: iex ((New-Object Net.WebClient).DownloadString('https://raw.githubusercontent.com/appveyor/secure-file/master/install.ps1'))
  - appveyor DownloadFile https://puu.sh/A6g5K/4d08705438.enc # signing certificate
  - cmd: appveyor-tools\secure-file -decrypt 4d08705438.enc -secret %decode_secret% -out %HOMEPATH%\deanherbert.pfx
  - appveyor DownloadFile https://puu.sh/A6g75/fdc6f19b04.enc # deploy configuration
-  - cmd: appveyor-tools\secure-file -decrypt fdc6f19b04.enc -secret %decode_secret% -out osu.Desktop.Deploy\bin\Debug\net471\osu.Desktop.Deploy.exe.config
-  - cd osu.Desktop.Deploy\bin\Debug\net471\
-  - osu.Desktop.Deploy.exe %code_signing_password%
+  - cd osu-deploy
+  - nuget restore -verbosity quiet
+  - msbuild osu.Desktop.Deploy.csproj
+  - cmd: ..\appveyor-tools\secure-file -decrypt ..\fdc6f19b04.enc -secret %decode_secret% -out bin\Debug\net471\osu.Desktop.Deploy.exe.config
+  - cd bin\Debug\net471\
+  - osu.Desktop.Deploy.exe %code_signing_password% %APPVEYOR_REPO_TAG_NAME%
 environment:
  TargetFramework: net471
  decode_secret:
@@ -31,4 +26,7 @@ environment:
  code_signing_password:
    secure: 34tLNqvjmmZEi97MLKfrnQ==
 artifacts:
-  - path: 'Releases\*'
+  - path: 'Releases\*'
+deploy:
+  - provider: Environment
+    name: github
@@ -1,29 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [{
-            "name": "Deploy (Debug)",
-            "request": "launch",
-            "type": "mono",
-            "program": "${workspaceRoot}/bin/Debug/net471/osu.Desktop.Deploy.exe",
-            "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Debug)",
-            "runtimeExecutable": null,
-            "env": {},
-            "console": "internalConsole"
-        },
-        {
-            "name": "Deploy (Release)",
-            "request": "launch",
-            "type": "clr",
-            "program": "${workspaceRoot}/bin/Release/net471/osu.Desktop.Deploy.exe",
-            "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Release)",
-            "runtimeExecutable": null,
-            "env": {},
-            "console": "internalConsole"
-        }
-    ]
-}
@@ -1,64 +0,0 @@
-{
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
-    "version": "2.0.0",
-    "command": "msbuild",
-    "type": "shell",
-    "suppressTaskName": true,
-    "args": [
-        "/property:GenerateFullPaths=true",
-        "/property:DebugType=portable",
-        "/verbosity:minimal",
-        "/m" //parallel compiling support.
-    ],
-    "tasks": [{
-            "taskName": "Build (Debug)",
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            },
-            "problemMatcher": [
-                "$msCompile"
-            ]
-        },
-        {
-            "taskName": "Build (Release)",
-            "group": "build",
-            "args": [
-                "/property:Configuration=Release"
-            ],
-            "problemMatcher": [
-                "$msCompile"
-            ]
-        },
-        {
-            "taskName": "Clean (Debug)",
-            "args": [
-                "/target:Clean"
-            ],
-            "problemMatcher": [
-                "$msCompile"
-            ]
-        },
-        {
-            "taskName": "Clean (Release)",
-            "args": [
-                "/target:Clean",
-                "/property:Configuration=Release"
-            ],
-            "problemMatcher": [
-                "$msCompile"
-            ]
-        },
-        {
-            "taskName": "Clean All",
-            "dependsOn": [
-                "Clean (Debug)",
-                "Clean (Release)"
-            ],
-            "problemMatcher": [
-                "$msCompile"
-            ]
-        }
-    ]
-}
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-->
-<configuration>
-  <appSettings>
-    <add key="StagingFolder" value="Staging" />
-    <add key="ReleasesFolder" value="Releases" />
-    <add key="GitHubAccessToken" value="" />
-    <add key="GitHubUsername" value="ppy" />
-    <add key="GitHubRepoName" value="osu" />
-    <add key="ProjectName" value="osu.Desktop" />
-    <add key="NuSpecName" value="osu.Desktop\osu.nuspec" />
-    <add key="SolutionName" value="osu" />
-    <add key="TargetName" value="osu.Desktop" />
-    <add key="PackageName" value="osulazer" />
-    <add key="IconName" value="lazer.ico" />
-    <add key="CodeSigningCertificate" value="" />
-  </appSettings>
-</configuration>
@@ -1,28 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using Newtonsoft.Json;
-
-namespace osu.Desktop.Deploy
-{
-    public class GitHubRelease
-    {
-        [JsonProperty(@"id")]
-        public int Id;
-
-        [JsonProperty(@"tag_name")]
-        public string TagName => $"v{Name}";
-
-        [JsonProperty(@"name")]
-        public string Name;
-
-        [JsonProperty(@"draft")]
-        public bool Draft;
-
-        [JsonProperty(@"prerelease")]
-        public bool PreRelease;
-
-        [JsonProperty(@"upload_url")]
-        public string UploadUrl;
-    }
-}
@@ -1,471 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Management.Automation;
-using Newtonsoft.Json;
-using osu.Framework.IO.Network;
-using FileWebRequest = osu.Framework.IO.Network.FileWebRequest;
-using WebRequest = osu.Framework.IO.Network.WebRequest;
-
-namespace osu.Desktop.Deploy
-{
-    internal static class Program
-    {
-        private static string packages => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".nuget", "packages");
-        private static string nugetPath => Path.Combine(packages, @"nuget.commandline\4.5.1\tools\NuGet.exe");
-        private static string squirrelPath => Path.Combine(packages, @"squirrel.windows\1.8.0\tools\Squirrel.exe");
-        private const string msbuild_path = @"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe";
-
-        public static string StagingFolder = ConfigurationManager.AppSettings["StagingFolder"];
-        public static string ReleasesFolder = ConfigurationManager.AppSettings["ReleasesFolder"];
-        public static string GitHubAccessToken = ConfigurationManager.AppSettings["GitHubAccessToken"];
-        public static string GitHubUsername = ConfigurationManager.AppSettings["GitHubUsername"];
-        public static string GitHubRepoName = ConfigurationManager.AppSettings["GitHubRepoName"];
-        public static string SolutionName = ConfigurationManager.AppSettings["SolutionName"];
-        public static string ProjectName = ConfigurationManager.AppSettings["ProjectName"];
-        public static string NuSpecName = ConfigurationManager.AppSettings["NuSpecName"];
-        public static string TargetNames = ConfigurationManager.AppSettings["TargetName"];
-        public static string PackageName = ConfigurationManager.AppSettings["PackageName"];
-        public static string IconName = ConfigurationManager.AppSettings["IconName"];
-        public static string CodeSigningCertificate = ConfigurationManager.AppSettings["CodeSigningCertificate"];
-
-        public static string GitHubApiEndpoint => $"https://api.github.com/repos/{GitHubUsername}/{GitHubRepoName}/releases";
-        public static string GitHubReleasePage => $"https://github.com/{GitHubUsername}/{GitHubRepoName}/releases";
-
-        /// <summary>
-        /// How many previous build deltas we want to keep when publishing.
-        /// </summary>
-        private const int keep_delta_count = 4;
-
-        private static string codeSigningCmd => string.IsNullOrEmpty(codeSigningPassword) ? "" : $"-n \"/a /f {codeSigningCertPath} /p {codeSigningPassword} /t http://timestamp.comodoca.com/authenticode\"";
-
-        private static string homeDir => Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
-        private static string codeSigningCertPath => Path.Combine(homeDir, CodeSigningCertificate);
-        private static string solutionPath => Environment.CurrentDirectory;
-        private static string stagingPath => Path.Combine(solutionPath, StagingFolder);
-        private static string iconPath => Path.Combine(solutionPath, ProjectName, IconName);
-
-        private static string nupkgFilename(string ver) => $"{PackageName}.{ver}.nupkg";
-        private static string nupkgDistroFilename(string ver) => $"{PackageName}-{ver}-full.nupkg";
-
-        private static readonly Stopwatch sw = new Stopwatch();
-
-        private static string codeSigningPassword;
-
-        private static bool interactive;
-
-        public static void Main(string[] args)
-        {
-            interactive = args.Length == 0;
-
-            displayHeader();
-
-            findSolutionPath();
-
-            if (!Directory.Exists(ReleasesFolder))
-            {
-                write("WARNING: No release directory found. Make sure you want this!", ConsoleColor.Yellow);
-                Directory.CreateDirectory(ReleasesFolder);
-            }
-
-            checkGitHubReleases();
-
-            refreshDirectory(StagingFolder);
-
-            //increment build number until we have a unique one.
-            string verBase = DateTime.Now.ToString("yyyy.Mdd.");
-            int increment = 0;
-            while (Directory.GetFiles(ReleasesFolder, $"*{verBase}{increment}*").Any())
-                increment++;
-
-            string version = $"{verBase}{increment}";
-
-            Console.ForegroundColor = ConsoleColor.White;
-            Console.Write($"Ready to deploy {version}!");
-            pauseIfInteractive();
-
-            sw.Start();
-
-            if (!string.IsNullOrEmpty(CodeSigningCertificate))
-            {
-                Console.Write("Enter code signing password: ");
-                codeSigningPassword = args.Length > 0 ? args[0] : readLineMasked();
-            }
-
-            write("Updating AssemblyInfo...");
-            updateCsprojVersion(version);
-            updateAppveyorVersion(version);
-
-            write("Running build process...");
-            foreach (string targetName in TargetNames.Split(','))
-                runCommand(msbuild_path, $"/v:quiet /m /t:{targetName.Replace('.', '_')} /p:OutputPath={stagingPath};Targets=\"Clean;Build\";Configuration=Release {SolutionName}.sln");
-
-            write("Creating NuGet deployment package...");
-            runCommand(nugetPath, $"pack {NuSpecName} -Version {version} -Properties Configuration=Deploy -OutputDirectory {stagingPath} -BasePath {stagingPath}");
-
-            //prune once before checking for files so we can avoid erroring on files which aren't even needed for this build.
-            pruneReleases();
-
-            checkReleaseFiles();
-
-            write("Running squirrel build...");
-            runCommand(squirrelPath, $"--releasify {stagingPath}\\{nupkgFilename(version)} --framework-version=net471 --setupIcon {iconPath} --icon {iconPath} {codeSigningCmd} --no-msi");
-
-            //prune again to clean up before upload.
-            pruneReleases();
-
-            //rename setup to install.
-            File.Copy(Path.Combine(ReleasesFolder, "Setup.exe"), Path.Combine(ReleasesFolder, "install.exe"), true);
-            File.Delete(Path.Combine(ReleasesFolder, "Setup.exe"));
-
-            uploadBuild(version);
-
-            //reset assemblyinfo.
-            updateCsprojVersion("0.0.0");
-
-            write("Done!", ConsoleColor.White);
-            pauseIfInteractive();
-        }
-
-        private static void displayHeader()
-        {
-            Console.ForegroundColor = ConsoleColor.Red;
-            Console.WriteLine();
-            Console.WriteLine("  Please note that OSU! and PPY are registered trademarks and as such covered by trademark law.");
-            Console.WriteLine("  Do not distribute builds of this project publicly that make use of these.");
-            Console.ResetColor();
-            Console.WriteLine();
-        }
-
-        /// <summary>
-        /// Ensure we have all the files in the release directory which are expected to be there.
-        /// This should have been accounted for in earlier steps, and just serves as a verification step.
-        /// </summary>
-        private static void checkReleaseFiles()
-        {
-            if (!canGitHub) return;
-
-            var releaseLines = getReleaseLines();
-
-            //ensure we have all files necessary
-            foreach (var l in releaseLines)
-                if (!File.Exists(Path.Combine(ReleasesFolder, l.Filename)))
-                    error($"Local file missing {l.Filename}");
-        }
-
-        private static IEnumerable<ReleaseLine> getReleaseLines() => File.ReadAllLines(Path.Combine(ReleasesFolder, "RELEASES")).Select(l => new ReleaseLine(l));
-
-        private static void pruneReleases()
-        {
-            if (!canGitHub) return;
-
-            write("Pruning RELEASES...");
-
-            var releaseLines = getReleaseLines().ToList();
-
-            var fulls = releaseLines.Where(l => l.Filename.Contains("-full")).Reverse().Skip(1);
-
-            //remove any FULL releases (except most recent)
-            foreach (var l in fulls)
-            {
-                write($"- Removing old release {l.Filename}", ConsoleColor.Yellow);
-                File.Delete(Path.Combine(ReleasesFolder, l.Filename));
-                releaseLines.Remove(l);
-            }
-
-            //remove excess deltas
-            var deltas = releaseLines.Where(l => l.Filename.Contains("-delta")).ToArray();
-            if (deltas.Length > keep_delta_count)
-            {
-                foreach (var l in deltas.Take(deltas.Length - keep_delta_count))
-                {
-                    write($"- Removing old delta {l.Filename}", ConsoleColor.Yellow);
-                    File.Delete(Path.Combine(ReleasesFolder, l.Filename));
-                    releaseLines.Remove(l);
-                }
-            }
-
-            var lines = new List<string>();
-            releaseLines.ForEach(l => lines.Add(l.ToString()));
-            File.WriteAllLines(Path.Combine(ReleasesFolder, "RELEASES"), lines);
-        }
-
-        private static void uploadBuild(string version)
-        {
-            if (!canGitHub || string.IsNullOrEmpty(CodeSigningCertificate))
-                return;
-
-            write("Publishing to GitHub...");
-
-            write($"- Creating release {version}...", ConsoleColor.Yellow);
-            var req = new JsonWebRequest<GitHubRelease>($"{GitHubApiEndpoint}")
-            {
-                Method = HttpMethod.POST,
-            };
-            req.AddRaw(JsonConvert.SerializeObject(new GitHubRelease
-            {
-                Name = version,
-                Draft = true,
-                PreRelease = true
-            }));
-            req.AuthenticatedBlockingPerform();
-
-            var assetUploadUrl = req.ResponseObject.UploadUrl.Replace("{?name,label}", "?name={0}");
-            foreach (var a in Directory.GetFiles(ReleasesFolder).Reverse()) //reverse to upload RELEASES first.
-            {
-                write($"- Adding asset {a}...", ConsoleColor.Yellow);
-                var upload = new WebRequest(assetUploadUrl, Path.GetFileName(a))
-                {
-                    Method = HttpMethod.POST,
-                    Timeout = 240000,
-                    ContentType = "application/octet-stream",
-                };
-
-                upload.AddRaw(File.ReadAllBytes(a));
-                upload.AuthenticatedBlockingPerform();
-            }
-
-            openGitHubReleasePage();
-        }
-
-        private static void openGitHubReleasePage() => Process.Start(GitHubReleasePage);
-
-        private static bool canGitHub => !string.IsNullOrEmpty(GitHubAccessToken);
-
-        private static void checkGitHubReleases()
-        {
-            if (!canGitHub) return;
-
-            write("Checking GitHub releases...");
-            var req = new JsonWebRequest<List<GitHubRelease>>($"{GitHubApiEndpoint}");
-            req.AuthenticatedBlockingPerform();
-
-            var lastRelease = req.ResponseObject.FirstOrDefault();
-
-            if (lastRelease == null)
-                return;
-
-            if (lastRelease.Draft)
-            {
-                openGitHubReleasePage();
-                error("There's a pending draft release! You probably don't want to push a build with this present.");
-            }
-
-            //there's a previous release for this project.
-            var assetReq = new JsonWebRequest<List<GitHubObject>>($"{GitHubApiEndpoint}/{lastRelease.Id}/assets");
-            assetReq.AuthenticatedBlockingPerform();
-            var assets = assetReq.ResponseObject;
-
-            //make sure our RELEASES file is the same as the last build on the server.
-            var releaseAsset = assets.FirstOrDefault(a => a.Name == "RELEASES");
-
-            //if we don't have a RELEASES asset then the previous release likely wasn't a Squirrel one.
-            if (releaseAsset == null) return;
-
-            write($"Last GitHub release was {lastRelease.Name}.");
-
-            bool requireDownload = false;
-
-            if (!File.Exists(Path.Combine(ReleasesFolder, nupkgDistroFilename(lastRelease.Name))))
-            {
-                write("Last version's package not found locally.", ConsoleColor.Red);
-                requireDownload = true;
-            }
-            else
-            {
-                var lastReleases = new RawFileWebRequest($"{GitHubApiEndpoint}/assets/{releaseAsset.Id}");
-                lastReleases.AuthenticatedBlockingPerform();
-                if (File.ReadAllText(Path.Combine(ReleasesFolder, "RELEASES")) != lastReleases.ResponseString)
-                {
-                    write("Server's RELEASES differed from ours.", ConsoleColor.Red);
-                    requireDownload = true;
-                }
-            }
-
-            if (!requireDownload) return;
-
-            write("Refreshing local releases directory...");
-            refreshDirectory(ReleasesFolder);
-
-            foreach (var a in assets)
-            {
-                if (a.Name.EndsWith(".exe")) continue;
-
-                write($"- Downloading {a.Name}...", ConsoleColor.Yellow);
-                new FileWebRequest(Path.Combine(ReleasesFolder, a.Name), $"{GitHubApiEndpoint}/assets/{a.Id}").AuthenticatedBlockingPerform();
-            }
-        }
-
-        private static void refreshDirectory(string directory)
-        {
-            if (Directory.Exists(directory))
-                Directory.Delete(directory, true);
-            Directory.CreateDirectory(directory);
-        }
-
-        private static void updateCsprojVersion(string version)
-        {
-            var toUpdate = new[] { "<Version>", "<FileVersion>" };
-            string file = Path.Combine(ProjectName, $"{ProjectName}.csproj");
-
-            var l1 = File.ReadAllLines(file);
-            List<string> l2 = new List<string>();
-            foreach (var l in l1)
-            {
-                string line = l;
-
-                foreach (var tag in toUpdate)
-                {
-                    int startIndex = l.IndexOf(tag, StringComparison.InvariantCulture);
-                    if (startIndex == -1)
-                        continue;
-                    startIndex += tag.Length;
-
-                    int endIndex = l.IndexOf("<", startIndex, StringComparison.InvariantCulture);
-                    line = $"{l.Substring(0, startIndex)}{version}{l.Substring(endIndex)}";
-                }
-
-                l2.Add(line);
-            }
-
-            File.WriteAllLines(file, l2);
-        }
-
-        /// <summary>
-        /// Find the base path of the active solution (git checkout location)
-        /// </summary>
-        private static void findSolutionPath()
-        {
-            string path = Path.GetDirectoryName(Environment.CommandLine.Replace("\"", "").Trim());
-
-            if (string.IsNullOrEmpty(path))
-                path = Environment.CurrentDirectory;
-
-            while (!File.Exists(Path.Combine(path, $"{SolutionName}.sln")))
-                path = path.Remove(path.LastIndexOf(Path.DirectorySeparatorChar));
-            path += Path.DirectorySeparatorChar;
-
-            Environment.CurrentDirectory = path;
-        }
-
-        private static bool runCommand(string command, string args)
-        {
-            var psi = new ProcessStartInfo(command, args)
-            {
-                WorkingDirectory = solutionPath,
-                CreateNoWindow = true,
-                RedirectStandardOutput = true,
-                RedirectStandardError = true,
-                UseShellExecute = false,
-                WindowStyle = ProcessWindowStyle.Hidden
-            };
-
-            Process p = Process.Start(psi);
-            if (p == null) return false;
-
-            string output = p.StandardOutput.ReadToEnd();
-            output += p.StandardError.ReadToEnd();
-
-            if (p.ExitCode == 0) return true;
-
-            write(output);
-            error($"Command {command} {args} failed!");
-            return false;
-        }
-
-        private static string readLineMasked()
-        {
-            var fg = Console.ForegroundColor;
-            Console.ForegroundColor = Console.BackgroundColor;
-            var ret = Console.ReadLine();
-            Console.ForegroundColor = fg;
-
-            return ret;
-        }
-
-        private static void error(string message)
-        {
-            Console.ForegroundColor = ConsoleColor.Red;
-            Console.WriteLine($"FATAL ERROR: {message}");
-
-            pauseIfInteractive();
-            Environment.Exit(-1);
-        }
-
-        private static void pauseIfInteractive()
-        {
-            if (interactive)
-                Console.ReadLine();
-            else
-                Console.WriteLine();
-        }
-
-        private static bool updateAppveyorVersion(string version)
-        {
-            try
-            {
-                using (PowerShell ps = PowerShell.Create())
-                {
-                    ps.AddScript($"Update-AppveyorBuild -Version \"{version}\"");
-                    ps.Invoke();
-                }
-                return true;
-            }
-            catch
-            {
-                // we don't have appveyor and don't care
-            }
-
-            return false;
-        }
-
-        private static void write(string message, ConsoleColor col = ConsoleColor.Gray)
-        {
-            if (sw.ElapsedMilliseconds > 0)
-            {
-                Console.ForegroundColor = ConsoleColor.Green;
-                Console.Write(sw.ElapsedMilliseconds.ToString().PadRight(8));
-            }
-            Console.ForegroundColor = col;
-            Console.WriteLine(message);
-        }
-
-        public static void AuthenticatedBlockingPerform(this WebRequest r)
-        {
-            r.AddHeader("Authorization", $"token {GitHubAccessToken}");
-            r.Perform();
-        }
-    }
-
-    internal class RawFileWebRequest : WebRequest
-    {
-        public RawFileWebRequest(string url) : base(url)
-        {
-        }
-
-        protected override string Accept => "application/octet-stream";
-    }
-
-    internal class ReleaseLine
-    {
-        public string Hash;
-        public string Filename;
-        public int Filesize;
-
-        public ReleaseLine(string line)
-        {
-            var split = line.Split(' ');
-            Hash = split[0];
-            Filename = split[1];
-            Filesize = int.Parse(split[2]);
-        }
-
-        public override string ToString() => $"{Hash} {Filename} {Filesize}";
-    }
-}
@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\osu.Game.props" />
-  <PropertyGroup Label="Project">
-    <TargetFrameworks>net471</TargetFrameworks>
-    <OutputType>Exe</OutputType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup Label="Project References">
-    <ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj" />
-  </ItemGroup>
-  <ItemGroup Label="Package References">
-    <PackageReference Include="NuGet.CommandLine" Version="4.5.1" />
-    <PackageReference Include="NUnit" Version="3.10.1" />
-    <PackageReference Include="squirrel.windows" Version="1.8.0" Condition="'$(TargetFramework)' == 'net471'" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.0" />
-    <PackageReference Include="System.Management.Automation.dll" Version="10.0.10586" />
-  </ItemGroup>
-</Project>
@@ -12,6 +12,7 @@ using osu.Framework.Platform;
 using osu.Game;
 using OpenTK.Input;
 using Microsoft.Win32;
+using osu.Framework.Platform.Windows;

 namespace osu.Desktop
 {
@@ -40,7 +41,7 @@ namespace osu.Desktop
        /// <summary>
        /// A method of accessing an osu-stable install in a controlled fashion.
        /// </summary>
-        private class StableStorage : DesktopStorage
+        private class StableStorage : WindowsStorage
        {
            protected override string LocateBasePath()
            {
@@ -72,7 +73,7 @@ namespace osu.Desktop
            }

            public StableStorage()
-                : base(string.Empty)
+                : base(string.Empty, null)
            {
            }
        }
@@ -1,19 +1,20 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

-using System.Diagnostics;
+using System;
 using osu.Framework.Allocation;
-using osu.Framework.Development;
 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;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
+using osu.Game.Utils;
 using OpenTK;
 using OpenTK.Graphics;

@@ -24,16 +25,18 @@ namespace osu.Desktop.Overlays
        private OsuConfigManager config;
        private OsuGameBase game;
        private NotificationOverlay notificationOverlay;
+        private GameHost host;

        public override bool HandleKeyboardInput => false;
        public override bool HandleMouseInput => false;

        [BackgroundDependencyLoader]
-        private void load(NotificationOverlay notification, OsuColour colours, TextureStore textures, OsuGameBase game, OsuConfigManager config)
+        private void load(NotificationOverlay notification, OsuColour colours, TextureStore textures, OsuGameBase game, OsuConfigManager config, GameHost host)
        {
            notificationOverlay = notification;
            this.config = config;
            this.game = game;
+            this.host = host;

            AutoSizeAxes = Axes.Both;
            Anchor = Anchor.BottomCentre;
@@ -106,19 +109,19 @@ namespace osu.Desktop.Overlays

                // 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));
+                    notificationOverlay.Post(new UpdateCompleteNotification(version, host.OpenUrlExternally));
            }
        }

        private class UpdateCompleteNotification : SimpleNotification
        {
-            public UpdateCompleteNotification(string version)
+            public UpdateCompleteNotification(string version, Action<string> openUrl = null)
            {
                Text = $"You are now running osu!lazer {version}.\nClick to see what's new!";
                Icon = FontAwesome.fa_check_square;
                Activated = delegate
                {
-                    Process.Start($"https://github.com/ppy/osu/releases/tag/v{version}");
+                    openUrl?.Invoke($"https://osu.ppy.sh/home/changelog/lazer/{version}");
                    return true;
                };
            }
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\osu.Game.props" />
  <PropertyGroup Label="Project">
-    <TargetFrameworks>net471;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net471;netcoreapp2.1</TargetFrameworks>
    <OutputType>WinExe</OutputType>
    <PlatformTarget>AnyCPU</PlatformTarget>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -20,20 +20,20 @@
    <StartupObject>osu.Desktop.Program</StartupObject>
  </PropertyGroup>
  <ItemGroup Label="Project References">
-    <ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj" />
    <ProjectReference Include="..\osu.Game\osu.Game.csproj" />
    <ProjectReference Include="..\osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj" />
    <ProjectReference Include="..\osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj" />
    <ProjectReference Include="..\osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj" />
    <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
    <ProjectReference Include="..\osu-resources\osu.Game.Resources\osu.Game.Resources.csproj" />
-    <PackageReference Include="Microsoft.Win32.Registry" Version="4.4.0" />
+    <PackageReference Include="Microsoft.Win32.Registry" Version="4.5.0" />
  </ItemGroup>
  <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.1" />
    <PackageReference Include="squirrel.windows" Version="1.8.0" Condition="'$(TargetFramework)' == 'net471'" />
  </ItemGroup>
  <ItemGroup Label="Resources">
    <EmbeddedResource Include="lazer.ico" />
  </ItemGroup>
-</Project>
+</Project>
@@ -22,7 +22,7 @@
            },
            "type": "mono",
            "request": "launch",
-            "program": "${workspaceRoot}/bin/Debug/net471/osu.Game.Rulesets.Catch.Tests.exe",
+            "program": "${workspaceRoot}/bin/Release/net471/osu.Game.Rulesets.Catch.Tests.exe",
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Release, msbuild)",
            "runtimeExecutable": null,
@@ -30,12 +30,12 @@
            "console": "internalConsole"
        },
        {
-            "name": "VisualTests (Debug, netcoreapp2.0)",
+            "name": "VisualTests (Debug, netcoreapp2.1)",
            "type": "coreclr",
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/bin/Debug/netcoreapp2.0/osu.Game.Rulesets.Catch.Tests.dll"
+                "${workspaceRoot}/bin/Debug/netcoreapp2.1/osu.Game.Rulesets.Catch.Tests.dll"
            ],
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Debug, dotnet)",
@@ -43,12 +43,12 @@
            "console": "internalConsole"
        },
        {
-            "name": "VisualTests (Release, netcoreapp2.0)",
+            "name": "VisualTests (Release, netcoreapp2.1)",
            "type": "coreclr",
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/bin/Debug/netcoreapp2.0/osu.Game.Rulesets.Catch.Tests.dll"
+                "${workspaceRoot}/bin/Release/netcoreapp2.1/osu.Game.Rulesets.Catch.Tests.dll"
            ],
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Release, dotnet)",
@@ -40,7 +40,7 @@
                "build",
                "--no-restore",
                "osu.Game.Rulesets.Catch.Tests.csproj",
-                "/p:TargetFramework=netcoreapp2.0",
+                "/p:TargetFramework=netcoreapp2.1",
                "/p:GenerateFullPaths=true",
                "/m",
                "/verbosity:m"
@@ -56,7 +56,7 @@
                "build",
                "--no-restore",
                "osu.Game.Rulesets.Catch.Tests.csproj",
-                "/p:TargetFramework=netcoreapp2.0",
+                "/p:TargetFramework=netcoreapp2.1",
                "/p:Configuration=Release",
                "/p:GenerateFullPaths=true",
                "/m",
@@ -75,7 +75,7 @@
            "problemMatcher": []
        },
        {
-            "label": "Restore (netcoreapp2.0)",
+            "label": "Restore (netcoreapp2.1)",
            "type": "shell",
            "command": "dotnet",
            "args": [
@@ -3,10 +3,9 @@

 using System;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 using NUnit.Framework;
 using osu.Framework.MathUtils;
-using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Catch.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects;
@@ -14,11 +13,13 @@ using osu.Game.Tests.Beatmaps;

 namespace osu.Game.Rulesets.Catch.Tests
 {
-    public class CatchBeatmapConversionTest : BeatmapConversionTest<TestCatchRuleset, ConvertValue>
+    internal class CatchBeatmapConversionTest : BeatmapConversionTest<ConvertValue>
    {
        protected override string ResourceAssembly => "osu.Game.Rulesets.Catch";

        [TestCase("basic"), Ignore("See: https://github.com/ppy/osu/issues/2232")]
+        [TestCase("spinner")]
+        [TestCase("spinner-and-circles")]
        public new void Test(string name)
        {
            base.Test(name);
@@ -29,43 +30,55 @@ namespace osu.Game.Rulesets.Catch.Tests
            if (hitObject is JuiceStream stream)
            {
                foreach (var nested in stream.NestedHitObjects)
-                {
-                    yield return new ConvertValue
-                    {
-                        StartTime = nested.StartTime,
-                        Position = ((CatchHitObject)nested).X * CatchPlayfield.BASE_WIDTH
-                    };
-                }
+                    yield return new ConvertValue((CatchHitObject)nested);
+            }
+            else if (hitObject is BananaShower shower)
+            {
+                foreach (var nested in shower.NestedHitObjects)
+                    yield return new ConvertValue((CatchHitObject)nested);
            }
            else
-            {
-                yield return new ConvertValue
-                {
-                    StartTime = hitObject.StartTime,
-                    Position = ((CatchHitObject)hitObject).X * CatchPlayfield.BASE_WIDTH
-                };
-            }
+                yield return new ConvertValue((CatchHitObject)hitObject);
        }

-        protected override IBeatmapConverter CreateConverter(IBeatmap beatmap) => new CatchBeatmapConverter(beatmap);
+        protected override Ruleset CreateRuleset() => new CatchRuleset();
    }

-    public struct ConvertValue : IEquatable<ConvertValue>
+    internal struct ConvertValue : IEquatable<ConvertValue>
    {
        /// <summary>
        /// A sane value to account for osu!stable using ints everwhere.
        /// </summary>
        private const float conversion_lenience = 2;

-        public double StartTime;
-        public float Position;
+        [JsonIgnore]
+        public readonly CatchHitObject HitObject;
+
+        public ConvertValue(CatchHitObject hitObject)
+        {
+            HitObject = hitObject;
+            startTime = 0;
+            position = 0;
+        }
+
+        private double startTime;
+
+        public double StartTime
+        {
+            get => HitObject?.StartTime ?? startTime;
+            set => startTime = value;
+        }
+
+        private float position;
+
+        public float Position
+        {
+            get => HitObject?.X * CatchPlayfield.BASE_WIDTH ?? position;
+            set => position = value;
+        }

        public bool Equals(ConvertValue other)
            => Precision.AlmostEquals(StartTime, other.StartTime, conversion_lenience)
               && Precision.AlmostEquals(Position, other.Position, conversion_lenience);
    }
-
-    public class TestCatchRuleset : CatchRuleset
-    {
-    }
 }
@@ -53,10 +53,10 @@ namespace osu.Game.Rulesets.Catch.Tests
            return beatmap;
        }

-        protected override Player CreatePlayer(WorkingBeatmap beatmap, Ruleset ruleset)
+        protected override Player CreatePlayer(Ruleset ruleset)
        {
-            beatmap.Mods.Value = beatmap.Mods.Value.Concat(new[] { ruleset.GetAutoplayMod() });
-            return base.CreatePlayer(beatmap, ruleset);
+            Beatmap.Value.Mods.Value = Beatmap.Value.Mods.Value.Concat(new[] { ruleset.GetAutoplayMod() });
+            return base.CreatePlayer(ruleset);
        }
    }
 }
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                Child = catcherArea = new TestCatcherArea(new BeatmapDifficulty { CircleSize = size })
                {
                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.BottomLeft
+                    Origin = Anchor.TopLeft
                },
            };
        }
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Catch.Tests
            {
            }

-            public void ToggleHyperDash(bool status) => MovableCatcher.HyperDashModifier = status ? 2 : 1;
+            public void ToggleHyperDash(bool status) => MovableCatcher.SetHyperdashState(status ? 2 : 1);
        }
    }
 }
@@ -25,6 +25,7 @@ namespace osu.Game.Rulesets.Catch.Tests
            typeof(DrawableCatchHitObject),
            typeof(DrawableFruit),
            typeof(DrawableDroplet),
+            typeof(BananaShower),
            typeof(Pulp),
        };

@@ -53,12 +54,19 @@ namespace osu.Game.Rulesets.Catch.Tests

        private DrawableFruit createDrawable(int index)
        {
-            var fruit = new Fruit
-            {
-                StartTime = 1000000000000,
-                IndexInBeatmap = index,
-                Scale = 1.5f,
-            };
+            Fruit fruit = index == 5
+                ? new BananaShower.Banana
+                {
+                    StartTime = 1000000000000,
+                    IndexInBeatmap = index,
+                    Scale = 1.5f,
+                }
+                : new Fruit
+                {
+                    StartTime = 1000000000000,
+                    IndexInBeatmap = index,
+                    Scale = 1.5f,
+                };

            return new DrawableFruit(fruit)
            {
@@ -1,16 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using NUnit.Framework;
-
-namespace osu.Game.Rulesets.Catch.Tests
-{
-    [TestFixture]
-    public class TestCasePerformancePoints : Game.Tests.Visual.TestCasePerformancePoints
-    {
-        public TestCasePerformancePoints()
-            : base(new CatchRuleset())
-        {
-        }
-    }
-}
@@ -2,7 +2,7 @@
  <Import Project="..\osu.TestProject.props" />
  <PropertyGroup Label="Project">
    <OutputType>WinExe</OutputType>
-    <TargetFrameworks>netcoreapp2.0;net471</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;net471</TargetFrameworks>
  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj" />
@@ -27,9 +27,6 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
            var comboData = obj as IHasCombo;
            var endTime = obj as IHasEndTime;

-            if (positionData == null)
-                yield break;
-
            if (curveData != null)
            {
                yield return new JuiceStream
@@ -41,14 +38,11 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                    Distance = curveData.Distance,
                    RepeatSamples = curveData.RepeatSamples,
                    RepeatCount = curveData.RepeatCount,
-                    X = positionData.X / CatchPlayfield.BASE_WIDTH,
+                    X = (positionData?.X ?? 0) / CatchPlayfield.BASE_WIDTH,
                    NewCombo = comboData?.NewCombo ?? false
                };
-
-                yield break;
            }
-
-            if (endTime != null)
+            else if (endTime != null)
            {
                yield return new BananaShower
                {
@@ -57,17 +51,17 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                    Duration = endTime.Duration,
                    NewCombo = comboData?.NewCombo ?? false
                };
-
-                yield break;
            }
-
-            yield return new Fruit
+            else
            {
-                StartTime = obj.StartTime,
-                Samples = obj.Samples,
-                NewCombo = comboData?.NewCombo ?? false,
-                X = positionData.X / CatchPlayfield.BASE_WIDTH
-            };
+                yield return new Fruit
+                {
+                    StartTime = obj.StartTime,
+                    Samples = obj.Samples,
+                    NewCombo = comboData?.NewCombo ?? false,
+                    X = (positionData?.X ?? 0) / CatchPlayfield.BASE_WIDTH
+                };
+            }
        }

        protected override Beatmap<CatchHitObject> CreateBeatmap() => new CatchBeatmap();
@@ -9,6 +9,7 @@ using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects.Types;
 using OpenTK;
+using osu.Game.Rulesets.Catch.MathUtils;

 namespace osu.Game.Rulesets.Catch.Beatmaps
 {
@@ -21,13 +22,54 @@ namespace osu.Game.Rulesets.Catch.Beatmaps

        public override void PostProcess()
        {
+            applyPositionOffsets();
+
            initialiseHyperDash((List<CatchHitObject>)Beatmap.HitObjects);

            base.PostProcess();

            int index = 0;
            foreach (var obj in Beatmap.HitObjects.OfType<CatchHitObject>())
+            {
                obj.IndexInBeatmap = index++;
+                if (obj.LastInCombo && obj.NestedHitObjects.LastOrDefault() is IHasComboInformation lastNested)
+                    lastNested.LastInCombo = true;
+            }
+        }
+
+        public const int RNG_SEED = 1337;
+
+        private void applyPositionOffsets()
+        {
+            var rng = new FastRandom(RNG_SEED);
+            // todo: HardRock displacement should be applied here
+
+            foreach (var obj in Beatmap.HitObjects)
+            {
+                switch (obj)
+                {
+                    case BananaShower bananaShower:
+                        foreach (var nested in bananaShower.NestedHitObjects)
+                        {
+                            ((BananaShower.Banana)nested).X = (float)rng.NextDouble();
+                            rng.Next(); // osu!stable retrieved a random banana type
+                            rng.Next(); // osu!stable retrieved a random banana rotation
+                            rng.Next(); // osu!stable retrieved a random banana colour
+                        }
+                        break;
+                    case JuiceStream juiceStream:
+                        foreach (var nested in juiceStream.NestedHitObjects)
+                        {
+                            var hitObject = (CatchHitObject)nested;
+                            if (hitObject is TinyDroplet)
+                                hitObject.X += rng.Next(-20, 20) / CatchPlayfield.BASE_WIDTH;
+                            else if (hitObject is Droplet)
+                                rng.Next(); // osu!stable retrieved a random droplet rotation
+                            hitObject.X = MathHelper.Clamp(hitObject.X, 0, 1);
+                        }
+                        break;
+                }
+            }
        }

        private void initialiseHyperDash(List<CatchHitObject> objects)
@@ -1,17 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Game.Beatmaps;
-using System.Collections.Generic;
-
-namespace osu.Game.Rulesets.Catch
-{
-    public class CatchDifficultyCalculator : DifficultyCalculator
-    {
-        public CatchDifficultyCalculator(IBeatmap beatmap) : base(beatmap)
-        {
-        }
-
-        public override double Calculate(Dictionary<string, double> categoryDifficulty = null) => 0;
-    }
-}
@@ -14,6 +14,8 @@ using osu.Game.Rulesets.Catch.Replays;
 using osu.Game.Rulesets.Replays.Types;
 using osu.Game.Beatmaps.Legacy;
 using osu.Game.Rulesets.Catch.Beatmaps;
+using osu.Game.Rulesets.Catch.Difficulty;
+using osu.Game.Rulesets.Difficulty;

 namespace osu.Game.Rulesets.Catch
 {
@@ -80,56 +82,25 @@ namespace osu.Game.Rulesets.Catch
                    {
                        new CatchModEasy(),
                        new CatchModNoFail(),
-                        new MultiMod
-                        {
-                            Mods = new Mod[]
-                            {
-                                new CatchModHalfTime(),
-                                new CatchModDaycore(),
-                            },
-                        },
+                        new MultiMod(new CatchModHalfTime(), new CatchModDaycore())
                    };
-
                case ModType.DifficultyIncrease:
                    return new Mod[]
                    {
                        new CatchModHardRock(),
-                        new MultiMod
-                        {
-                            Mods = new Mod[]
-                            {
-                                new CatchModSuddenDeath(),
-                                new CatchModPerfect(),
-                            },
-                        },
-                        new MultiMod
-                        {
-                            Mods = new Mod[]
-                            {
-                                new CatchModDoubleTime(),
-                                new CatchModNightcore(),
-                            },
-                        },
+                        new MultiMod(new CatchModSuddenDeath(), new CatchModPerfect()),
+                        new MultiMod(new CatchModDoubleTime(), new CatchModNightcore()),
                        new CatchModHidden(),
                        new CatchModFlashlight(),
                    };
-
                case ModType.Special:
                    return new Mod[]
                    {
                        new CatchModRelax(),
                        null,
                        null,
-                        new MultiMod
-                        {
-                            Mods = new Mod[]
-                            {
-                                new CatchModAutoplay(),
-                                new ModCinema(),
-                            },
-                        },
+                        new MultiMod(new CatchModAutoplay(), new ModCinema()),
                    };
-
                default:
                    return new Mod[] { };
            }
@@ -141,7 +112,7 @@ namespace osu.Game.Rulesets.Catch

        public override Drawable CreateIcon() => new SpriteIcon { Icon = FontAwesome.fa_osu_fruits_o };

-        public override DifficultyCalculator CreateDifficultyCalculator(IBeatmap beatmap, Mod[] mods = null) => new CatchDifficultyCalculator(beatmap);
+        public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new CatchDifficultyCalculator(this, beatmap);

        public override int? LegacyID => 2;

@@ -0,0 +1,19 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Catch.Difficulty
+{
+    public class CatchDifficultyAttributes : DifficultyAttributes
+    {
+        public double ApproachRate;
+        public int MaxCombo;
+
+        public CatchDifficultyAttributes(Mod[] mods, double starRating)
+            : base(mods, starRating)
+        {
+        }
+    }
+}
@@ -0,0 +1,146 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Catch.UI;
+
+namespace osu.Game.Rulesets.Catch.Difficulty
+{
+    public class CatchDifficultyCalculator : DifficultyCalculator
+    {
+
+        /// <summary>
+        /// In milliseconds. For difficulty calculation we will only look at the highest strain value in each time interval of size STRAIN_STEP.
+        /// This is to eliminate higher influence of stream over aim by simply having more HitObjects with high strain.
+        /// The higher this value, the less strains there will be, indirectly giving long beatmaps an advantage.
+        /// </summary>
+        private const double strain_step = 750;
+
+        /// <summary>
+        /// The weighting of each strain value decays to this number * it's previous value
+        /// </summary>
+        private const double decay_weight = 0.94;
+
+        private const double star_scaling_factor = 0.145;
+
+        public CatchDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)
+            : base(ruleset, beatmap)
+        {
+        }
+
+        protected override DifficultyAttributes Calculate(IBeatmap beatmap, Mod[] mods, double timeRate)
+        {
+            if (!beatmap.HitObjects.Any())
+                return new CatchDifficultyAttributes(mods, 0);
+
+            var catcher = new CatcherArea.Catcher(beatmap.BeatmapInfo.BaseDifficulty);
+            float halfCatchWidth = catcher.CatchWidth * 0.5f;
+
+            var difficultyHitObjects = new List<CatchDifficultyHitObject>();
+
+            foreach (var hitObject in beatmap.HitObjects)
+            {
+                // We want to only consider fruits that contribute to the combo. Droplets are addressed as accuracy and spinners are not relevant for "skill" calculations.
+                if (hitObject is Fruit)
+                {
+                    difficultyHitObjects.Add(new CatchDifficultyHitObject((CatchHitObject)hitObject, halfCatchWidth));
+                }
+                if (hitObject is JuiceStream)
+                    difficultyHitObjects.AddRange(hitObject.NestedHitObjects.OfType<CatchHitObject>().Where(o => !(o is TinyDroplet)).Select(o => new CatchDifficultyHitObject(o, halfCatchWidth)));
+            }
+
+            difficultyHitObjects.Sort((a, b) => a.BaseHitObject.StartTime.CompareTo(b.BaseHitObject.StartTime));
+
+            if (!calculateStrainValues(difficultyHitObjects, timeRate))
+                return new CatchDifficultyAttributes(mods, 0);
+
+            // 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) / timeRate;
+            double starRating = Math.Sqrt(calculateDifficulty(difficultyHitObjects, timeRate)) * star_scaling_factor;
+
+            return new CatchDifficultyAttributes(mods, starRating)
+            {
+                ApproachRate = preEmpt > 1200.0 ? -(preEmpt - 1800.0) / 120.0 : -(preEmpt - 1200.0) / 150.0 + 5.0,
+                MaxCombo = difficultyHitObjects.Count
+            };
+        }
+
+        private bool calculateStrainValues(List<CatchDifficultyHitObject> objects, double timeRate)
+        {
+            CatchDifficultyHitObject lastObject = null;
+
+            if (!objects.Any()) return false;
+
+            // Traverse hitObjects in pairs to calculate the strain value of NextHitObject from the strain value of CurrentHitObject and environment.
+            foreach (var currentObject in objects)
+            {
+                if (lastObject != null)
+                    currentObject.CalculateStrains(lastObject, timeRate);
+
+                lastObject = currentObject;
+            }
+
+            return true;
+        }
+
+        private double calculateDifficulty(List<CatchDifficultyHitObject> objects, double timeRate)
+        {
+            // The strain step needs to be adjusted for the algorithm to be considered equal with speed changing mods
+            double actualStrainStep = strain_step * timeRate;
+
+            // Find the highest strain value within each strain step
+            var highestStrains = new List<double>();
+            double intervalEndTime = actualStrainStep;
+            double maximumStrain = 0; // We need to keep track of the maximum strain in the current interval
+
+            CatchDifficultyHitObject previousHitObject = null;
+            foreach (CatchDifficultyHitObject hitObject in objects)
+            {
+                // While we are beyond the current interval push the currently available maximum to our strain list
+                while (hitObject.BaseHitObject.StartTime > intervalEndTime)
+                {
+                    highestStrains.Add(maximumStrain);
+
+                    // The maximum strain of the next interval is not zero by default! We need to take the last hitObject we encountered, take its strain and apply the decay
+                    // until the beginning of the next interval.
+                    if (previousHitObject == null)
+                    {
+                        maximumStrain = 0;
+                    }
+                    else
+                    {
+                        double decay = Math.Pow(CatchDifficultyHitObject.DECAY_BASE, (intervalEndTime - previousHitObject.BaseHitObject.StartTime) / 1000);
+                        maximumStrain = previousHitObject.Strain * decay;
+                    }
+
+                    // Go to the next time interval
+                    intervalEndTime += actualStrainStep;
+                }
+
+                // Obtain maximum strain
+                maximumStrain = Math.Max(hitObject.Strain, maximumStrain);
+
+                previousHitObject = hitObject;
+            }
+
+            // Build the weighted sum over the highest strains for each interval
+            double difficulty = 0;
+            double weight = 1;
+            highestStrains.Sort((a, b) => b.CompareTo(a)); // Sort from highest to lowest strain.
+
+            foreach (double strain in highestStrains)
+            {
+                difficulty += weight * strain;
+                weight *= decay_weight;
+            }
+
+            return difficulty;
+        }
+    }
+}
@@ -0,0 +1,130 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Catch.UI;
+using OpenTK;
+
+namespace osu.Game.Rulesets.Catch.Difficulty
+{
+    public class CatchDifficultyHitObject
+    {
+        internal static readonly double DECAY_BASE = 0.20;
+        private const float normalized_hitobject_radius = 41.0f;
+        private const float absolute_player_positioning_error = 16f;
+        private readonly float playerPositioningError;
+
+        internal CatchHitObject BaseHitObject;
+
+        /// <summary>
+        /// Measures jump difficulty. CtB doesn't have something like button pressing speed or accuracy
+        /// </summary>
+        internal double Strain = 1;
+
+        /// <summary>
+        /// This is required to keep track of lazy player movement (always moving only as far as necessary)
+        /// Without this quick repeat sliders / weirdly shaped streams might become ridiculously overrated
+        /// </summary>
+        internal float PlayerPositionOffset;
+        internal float LastMovement;
+
+        internal float NormalizedPosition;
+        internal float ActualNormalizedPosition => NormalizedPosition + PlayerPositionOffset;
+
+        internal CatchDifficultyHitObject(CatchHitObject baseHitObject, float catcherWidthHalf)
+        {
+            BaseHitObject = baseHitObject;
+
+            // We will scale everything by this factor, so we can assume a uniform CircleSize among beatmaps.
+            float scalingFactor = normalized_hitobject_radius / catcherWidthHalf;
+
+            playerPositioningError = absolute_player_positioning_error; // * scalingFactor;
+            NormalizedPosition = baseHitObject.X * CatchPlayfield.BASE_WIDTH * scalingFactor;
+        }
+
+        private const double direction_change_bonus = 12.5;
+        internal void CalculateStrains(CatchDifficultyHitObject previousHitObject, double timeRate)
+        {
+            // Rather simple, but more specialized things are inherently inaccurate due to the big difference playstyles and opinions make.
+            // See Taiko feedback thread.
+            double timeElapsed = (BaseHitObject.StartTime - previousHitObject.BaseHitObject.StartTime) / timeRate;
+            double decay = Math.Pow(DECAY_BASE, timeElapsed / 1000);
+
+            // Update new position with lazy movement.
+            PlayerPositionOffset =
+                MathHelper.Clamp(
+                    previousHitObject.ActualNormalizedPosition,
+                    NormalizedPosition - (normalized_hitobject_radius - playerPositioningError),
+                    NormalizedPosition + (normalized_hitobject_radius - playerPositioningError)) // Obtain new lazy position, but be stricter by allowing for an error of a certain degree of the player.
+                - NormalizedPosition; // Subtract HitObject position to obtain offset
+
+            LastMovement = DistanceTo(previousHitObject);
+            double addition = spacingWeight(LastMovement);
+
+            if (NormalizedPosition < previousHitObject.NormalizedPosition)
+            {
+                LastMovement = -LastMovement;
+            }
+
+            CatchHitObject previousHitCircle = previousHitObject.BaseHitObject;
+
+            double additionBonus = 0;
+            double sqrtTime = Math.Sqrt(Math.Max(timeElapsed, 25));
+
+            // Direction changes give an extra point!
+            if (Math.Abs(LastMovement) > 0.1)
+            {
+                if (Math.Abs(previousHitObject.LastMovement) > 0.1 && Math.Sign(LastMovement) != Math.Sign(previousHitObject.LastMovement))
+                {
+                    double bonus = direction_change_bonus / sqrtTime;
+
+                    // Weight bonus by how
+                    double bonusFactor = Math.Min(playerPositioningError, Math.Abs(LastMovement)) / playerPositioningError;
+
+                    // We want time to play a role twice here!
+                    addition += bonus * bonusFactor;
+
+                    // Bonus for tougher direction switches and "almost" hyperdashes at this point
+                    if (previousHitCircle != null && previousHitCircle.DistanceToHyperDash <= 10.0f / CatchPlayfield.BASE_WIDTH)
+                    {
+                        additionBonus += 0.3 * bonusFactor;
+                    }
+                }
+
+                // Base bonus for every movement, giving some weight to streams.
+                addition += 7.5 * Math.Min(Math.Abs(LastMovement), normalized_hitobject_radius * 2) / (normalized_hitobject_radius * 6) / sqrtTime;
+            }
+
+            // Bonus for "almost" hyperdashes at corner points
+            if (previousHitCircle != null && previousHitCircle.DistanceToHyperDash <= 10.0f / CatchPlayfield.BASE_WIDTH)
+            {
+                if (!previousHitCircle.HyperDash)
+                {
+                    additionBonus += 1.0;
+                }
+                else
+                {
+                    // After a hyperdash we ARE in the correct position. Always!
+                    PlayerPositionOffset = 0;
+                }
+
+                addition *= 1.0 + additionBonus * ((10 - previousHitCircle.DistanceToHyperDash * CatchPlayfield.BASE_WIDTH) / 10);
+            }
+
+            addition *= 850.0 / Math.Max(timeElapsed, 25);
+
+            Strain = previousHitObject.Strain * decay + addition;
+        }
+
+        private static double spacingWeight(float distance)
+        {
+            return Math.Pow(distance, 1.3) / 500;
+        }
+
+        internal float DistanceTo(CatchDifficultyHitObject other)
+        {
+            return Math.Abs(ActualNormalizedPosition - other.ActualNormalizedPosition);
+        }
+    }
+}
@@ -0,0 +1,91 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+
+namespace osu.Game.Rulesets.Catch.MathUtils
+{
+    /// <summary>
+    /// A PRNG specified in http://heliosphan.org/fastrandom.html.
+    /// </summary>
+    public class FastRandom
+    {
+        private const double int_to_real = 1.0 / (int.MaxValue + 1.0);
+        private const uint int_mask = 0x7FFFFFFF;
+        private const uint y = 842502087;
+        private const uint z = 3579807591;
+        private const uint w = 273326509;
+        private uint _x, _y = y, _z = z, _w = w;
+
+        public FastRandom(int seed)
+        {
+            _x = (uint)seed;
+        }
+
+        public FastRandom()
+            : this(Environment.TickCount)
+        {
+        }
+
+        /// <summary>
+        /// Generates a random unsigned integer within the range [<see cref="uint.MinValue"/>, <see cref="uint.MaxValue"/>).
+        /// </summary>
+        /// <returns>The random value.</returns>
+        public uint NextUInt()
+        {
+            uint t = _x ^ _x << 11;
+            _x = _y;
+            _y = _z;
+            _z = _w;
+            return _w = _w ^ _w >> 19 ^ t ^ t >> 8;
+        }
+
+        /// <summary>
+        /// Generates a random integer value within the range [0, <see cref="int.MaxValue"/>).
+        /// </summary>
+        /// <returns>The random value.</returns>
+        public int Next() => (int)(int_mask & NextUInt());
+
+        /// <summary>
+        /// Generates a random integer value within the range [0, <paramref name="upperBound"/>).
+        /// </summary>
+        /// <param name="upperBound">The upper bound.</param>
+        /// <returns>The random value.</returns>
+        public int Next(int upperBound) => (int)(NextDouble() * upperBound);
+
+        /// <summary>
+        /// Generates a random integer value within the range [<paramref name="lowerBound"/>, <paramref name="upperBound"/>).
+        /// </summary>
+        /// <param name="lowerBound">The lower bound of the range.</param>
+        /// <param name="upperBound">The upper bound of the range.</param>
+        /// <returns>The random value.</returns>
+        public int Next(int lowerBound, int upperBound) => (int)(lowerBound + NextDouble() * (upperBound - lowerBound));
+
+        /// <summary>
+        /// Generates a random double value within the range [0, 1).
+        /// </summary>
+        /// <returns>The random value.</returns>
+        public double NextDouble() => int_to_real * Next();
+
+        private uint bitBuffer;
+        private int bitIndex = 32;
+
+        /// <summary>
+        /// Generates a reandom boolean value. Cached such that a random value is only generated once in every 32 calls.
+        /// </summary>
+        /// <returns>The random value.</returns>
+        public bool NextBool()
+        {
+            if (bitIndex == 32)
+            {
+                bitBuffer = NextUInt();
+                bitIndex = 1;
+
+                return (bitBuffer & 1) == 1;
+            }
+
+            bitIndex++;
+            return ((bitBuffer >>= 1) & 1) == 1;
+        }
+    }
+}
@@ -1,7 +1,6 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

-using osu.Framework.MathUtils;
 using osu.Game.Rulesets.Objects.Types;

 namespace osu.Game.Rulesets.Catch.Objects
@@ -31,8 +30,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                AddNested(new Banana
                {
                    Samples = Samples,
-                    StartTime = i,
-                    X = RNG.NextSingle()
+                    StartTime = i
                });
        }

@@ -24,6 +24,11 @@ namespace osu.Game.Rulesets.Catch.Objects

        public int ComboIndex { get; set; }

+        /// <summary>
+        /// The distance for a fruit to to next hyper if it's not a hyper.
+        /// </summary>
+        public float DistanceToHyperDash { get; set; }
+
        /// <summary>
        /// The next fruit starts a new combo. Used for explodey.
        /// </summary>
@@ -47,6 +52,8 @@ namespace osu.Game.Rulesets.Catch.Objects

            Scale = 1.0f - 0.7f * (difficulty.CircleSize - 5) / 5;
        }
+
+        protected override HitWindows CreateHitWindows() => null;
    }

    public enum FruitVisualRepresentation
@@ -42,6 +42,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
    {
        public virtual bool CanBePlated => false;

+        public virtual bool StaysOnPlate => CanBePlated;
+
        protected DrawableCatchHitObject(CatchHitObject hitObject)
            : base(hitObject)
        {
@@ -13,6 +13,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
    {
        private Pulp pulp;

+        public override bool StaysOnPlate => false;
+
        public DrawableDroplet(Droplet h)
            : base(h)
        {
@@ -18,12 +18,19 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
    {
        private Circle border;

+        private const float drawable_radius = (float)CatchHitObject.OBJECT_RADIUS * radius_adjust;
+
+        /// <summary>
+        /// Because we're adding a border around the fruit, we need to scale down some.
+        /// </summary>
+        private const float radius_adjust = 1.1f;
+
        public DrawableFruit(Fruit h)
            : base(h)
        {
            Origin = Anchor.Centre;

-            Size = new Vector2((float)CatchHitObject.OBJECT_RADIUS);
+            Size = new Vector2(drawable_radius);
            Masking = false;

            Rotation = (float)(RNG.NextDouble() - 0.5f) * 40;
@@ -44,14 +51,14 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                    {
                        Hollow = !HitObject.HyperDash,
                        Type = EdgeEffectType.Glow,
-                        Radius = 4,
+                        Radius = 4 * radius_adjust,
                        Colour = HitObject.HyperDash ? Color4.Red : AccentColour.Darken(1).Opacity(0.6f)
                    },
-                    Size = new Vector2(Height * 1.5f),
+                    Size = new Vector2(Height),
                    Anchor = Anchor.Centre,
                    Origin = Anchor.Centre,
                    BorderColour = Color4.White,
-                    BorderThickness = 4f,
+                    BorderThickness = 3f * radius_adjust,
                    Children = new Framework.Graphics.Drawable[]
                    {
                        new Box
@@ -82,8 +89,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable

        private Framework.Graphics.Drawable createPulp(FruitVisualRepresentation representation)
        {
-            const float large_pulp_3 = 13f;
-            const float distance_from_centre_3 = 0.23f;
+            const float large_pulp_3 = 8f * radius_adjust;
+            const float distance_from_centre_3 = 0.15f;

            const float large_pulp_4 = large_pulp_3 * 0.925f;
            const float distance_from_centre_4 = distance_from_centre_3 / 0.925f;
@@ -106,11 +113,9 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                        {
                            new Pulp
                            {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.BottomCentre,
                                AccentColour = AccentColour,
                                Size = new Vector2(small_pulp),
-                                Y = 0.05f,
+                                Y = -0.34f,
                            },
                            new Pulp
                            {
@@ -146,11 +151,9 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                        {
                            new Pulp
                            {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.BottomCentre,
                                AccentColour = AccentColour,
                                Size = new Vector2(small_pulp),
-                                Y = 0.1f,
+                                Y = -0.3f,
                            },
                            new Pulp
                            {
@@ -186,11 +189,9 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                        {
                            new Pulp
                            {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
                                AccentColour = AccentColour,
                                Size = new Vector2(small_pulp),
-                                Y = -0.1f,
+                                Y = -0.33f,
                            },
                            new Pulp
                            {
@@ -220,10 +221,9 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                        {
                            new Pulp
                            {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
                                AccentColour = AccentColour,
                                Size = new Vector2(small_pulp),
+                                Y = -0.25f,
                            },
                            new Pulp
                            {
@@ -253,16 +253,15 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                        {
                            new Pulp
                            {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
                                AccentColour = AccentColour,
                                Size = new Vector2(small_pulp),
-                                Y = -0.15f
+                                Y = -0.3f
                            },
                            new Pulp
                            {
                                AccentColour = AccentColour,
-                                Size = new Vector2(large_pulp_4 * 1.2f, large_pulp_4 * 3),
+                                Size = new Vector2(large_pulp_4 * 0.8f, large_pulp_4 * 2.5f),
+                                Y = 0.05f,
                            },
                        }
                    };
@@ -29,14 +29,24 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable.Pieces
            set
            {
                accentColour = value;
-
-                EdgeEffect = new EdgeEffectParameters
-                {
-                    Type = EdgeEffectType.Glow,
-                    Radius = 8,
-                    Colour = accentColour.Darken(0.2f).Opacity(0.75f)
-                };
+                if (IsLoaded) updateAccentColour();
            }
        }
+
+        private void updateAccentColour()
+        {
+            EdgeEffect = new EdgeEffectParameters
+            {
+                Type = EdgeEffectType.Glow,
+                Radius = Size.X / 2,
+                Colour = accentColour.Darken(0.2f).Opacity(0.75f)
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            updateAccentColour();
+        }
    }
 }
@@ -42,7 +42,6 @@ namespace osu.Game.Rulesets.Catch.Objects
        protected override void CreateNestedHitObjects()
        {
            base.CreateNestedHitObjects();
-
            createTicks();
        }

@@ -28,9 +28,9 @@ namespace osu.Game.Rulesets.Catch.Replays
            }
        }

-        public override List<InputState> GetPendingStates()
+        public override List<IInput> GetPendingInputs()
        {
-            if (!Position.HasValue) return new List<InputState>();
+            if (!Position.HasValue) return new List<IInput>();

            var actions = new List<CatchAction>();

@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Catch.Replays
            else if (Position.Value < CurrentFrame.Position)
                actions.Add(CatchAction.MoveLeft);

-            return new List<InputState>
+            return new List<IInput>
            {
                new CatchReplayState
                {
@@ -0,0 +1,65 @@
+{
+    "Mappings": [{
+            "StartTime": 2589,
+            "Objects": [{
+                "StartTime": 2589,
+                "Position": 256
+            }]
+        },
+        {
+            "StartTime": 2915,
+            "Objects": [{
+                    "StartTime": 2915,
+                    "Position": 65
+                },
+                {
+                    "StartTime": 2916,
+                    "Position": 482
+                }
+            ]
+        },
+        {
+            "StartTime": 3078,
+            "Objects": [{
+                    "StartTime": 3078,
+                    "Position": 164
+                },
+                {
+                    "StartTime": 3079,
+                    "Position": 315
+                }
+            ]
+        },
+        {
+            "StartTime": 3241,
+            "Objects": [{
+                    "StartTime": 3241,
+                    "Position": 145
+                },
+                {
+                    "StartTime": 3242,
+                    "Position": 159
+                }
+            ]
+        },
+        {
+            "StartTime": 3404,
+            "Objects": [{
+                    "StartTime": 3404,
+                    "Position": 310
+                },
+                {
+                    "StartTime": 3405,
+                    "Position": 441
+                }
+            ]
+        },
+        {
+            "StartTime": 5197,
+            "Objects": [{
+                "StartTime": 5197,
+                "Position": 256
+            }]
+        }
+    ]
+}
@@ -0,0 +1,24 @@
+osu file format v14
+
+[General]
+StackLeniency: 0.7
+Mode: 2
+
+[Difficulty]
+HPDrainRate:5
+CircleSize:2
+OverallDifficulty:5
+ApproachRate:8
+SliderMultiplier:1.4
+SliderTickRate:4
+
+[TimingPoints]
+2589,326.086956521739,4,2,1,70,1,0
+
+[HitObjects]
+256,192,2589,5,0,0:0:0:0:
+256,192,2915,12,0,2916,0:0:0:0:
+256,192,3078,12,0,3079,0:0:0:0:
+256,192,3241,12,0,3242,0:0:0:0:
+256,192,3404,12,0,3405,0:0:0:0:
+256,192,5197,5,0,0:0:0:0:
@@ -0,0 +1,74 @@
+{
+    "Mappings": [{
+        "StartTime": 18500,
+        "Objects": [{
+                "StartTime": 18500,
+                "Position": 65
+            },
+            {
+                "StartTime": 18559,
+                "Position": 482
+            },
+            {
+                "StartTime": 18618,
+                "Position": 164
+            },
+            {
+                "StartTime": 18678,
+                "Position": 315
+            },
+            {
+                "StartTime": 18737,
+                "Position": 145
+            },
+            {
+                "StartTime": 18796,
+                "Position": 159
+            },
+            {
+                "StartTime": 18856,
+                "Position": 310
+            },
+            {
+                "StartTime": 18915,
+                "Position": 441
+            },
+            {
+                "StartTime": 18975,
+                "Position": 428
+            },
+            {
+                "StartTime": 19034,
+                "Position": 243
+            },
+            {
+                "StartTime": 19093,
+                "Position": 422
+            },
+            {
+                "StartTime": 19153,
+                "Position": 481
+            },
+            {
+                "StartTime": 19212,
+                "Position": 104
+            },
+            {
+                "StartTime": 19271,
+                "Position": 473
+            },
+            {
+                "StartTime": 19331,
+                "Position": 135
+            },
+            {
+                "StartTime": 19390,
+                "Position": 360
+            },
+            {
+                "StartTime": 19450,
+                "Position": 123
+            }
+        ]
+    }]
+}
@@ -0,0 +1,20 @@
+osu file format v14
+
+[General]
+Mode: 2
+
+[Difficulty]
+HPDrainRate:6
+CircleSize:4
+OverallDifficulty:7
+ApproachRate:8.3
+SliderMultiplier:1.6
+SliderTickRate:1
+
+[TimingPoints]
+500,500,4,2,1,50,1,0
+13426,-100,4,3,1,45,0,0
+14884,-100,4,2,1,50,0,0
+
+[HitObjects]
+256,192,18500,12,0,19450,0:0:0:0:
@@ -32,6 +32,8 @@ namespace osu.Game.Rulesets.Catch.UI

        public override PassThroughInputManager CreateInputManager() => new CatchInputManager(Ruleset.RulesetInfo);

+        protected override Vector2 PlayfieldArea => new Vector2(0.86f); // matches stable's vertical offset for catcher plate
+
        protected override DrawableHitObject<CatchHitObject> GetVisualRepresentation(CatchHitObject h)
        {
            switch (h)
@@ -16,6 +16,7 @@ using osu.Game.Rulesets.Catch.Objects.Drawable;
 using osu.Game.Rulesets.Catch.Replays;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.UI;
 using OpenTK;
 using OpenTK.Graphics;

@@ -23,7 +24,7 @@ namespace osu.Game.Rulesets.Catch.UI
 {
    public class CatcherArea : Container
    {
-        public const float CATCHER_SIZE = 172;
+        public const float CATCHER_SIZE = 84;

        protected readonly Catcher MovableCatcher;

@@ -48,6 +49,16 @@ namespace osu.Game.Rulesets.Catch.UI

        public void OnJudgement(DrawableCatchHitObject fruit, Judgement judgement)
        {
+            void runAfterLoaded(Action action)
+            {
+                // this is required to make this run after the last caught fruit runs UpdateState at least once.
+                // TODO: find a better alternative
+                if (lastPlateableFruit.IsLoaded)
+                    action();
+                else
+                    lastPlateableFruit.OnLoadComplete = _ => action();
+            }
+
            if (judgement.IsHit && fruit.CanBePlated)
            {
                var caughtFruit = (DrawableCatchHitObject)GetVisualRepresentation?.Invoke(fruit.HitObject);
@@ -63,21 +74,17 @@ namespace osu.Game.Rulesets.Catch.UI
                caughtFruit.LifetimeEnd = double.MaxValue;

                MovableCatcher.Add(caughtFruit);
-
                lastPlateableFruit = caughtFruit;
+
+                if (!fruit.StaysOnPlate)
+                    runAfterLoaded(() => MovableCatcher.Explode(caughtFruit));
+
            }

            if (fruit.HitObject.LastInCombo)
            {
                if (judgement.IsHit)
-                {
-                    // this is required to make this run after the last caught fruit runs UpdateState at least once.
-                    // TODO: find a better alternative
-                    if (lastPlateableFruit.IsLoaded)
-                        MovableCatcher.Explode();
-                    else
-                        lastPlateableFruit.OnLoadComplete = _ => { MovableCatcher.Explode(); };
-                }
+                    runAfterLoaded(() => MovableCatcher.Explode());
                else
                    MovableCatcher.Drop();
            }
@@ -87,7 +94,7 @@ namespace osu.Game.Rulesets.Catch.UI
        {
            base.UpdateAfterChildren();

-            var state = GetContainingInputManager().CurrentState as CatchFramedReplayInputHandler.CatchReplayState;
+            var state = (GetContainingInputManager().CurrentState as RulesetInputManagerInputState<CatchAction>)?.LastReplayState as CatchFramedReplayInputHandler.CatchReplayState;

            if (state?.CatcherX != null)
                MovableCatcher.X = state.CatcherX.Value;
@@ -99,7 +106,10 @@ namespace osu.Game.Rulesets.Catch.UI

        public class Catcher : Container, IKeyBindingHandler<CatchAction>
        {
-            private Texture texture;
+            /// <summary>
+            /// Width of the area that can be used to attempt catches during gameplay.
+            /// </summary>
+            internal float CatchWidth => CATCHER_SIZE * Math.Abs(Scale.X);

            private Container<DrawableHitObject> caughtFruit;

@@ -121,10 +131,8 @@ namespace osu.Game.Rulesets.Catch.UI
            }

            [BackgroundDependencyLoader]
-            private void load(TextureStore textures)
+            private void load()
            {
-                texture = textures.Get(@"Play/Catch/fruit-catcher-idle");
-
                Children = new Drawable[]
                {
                    caughtFruit = new Container<DrawableHitObject>
@@ -196,13 +204,7 @@ namespace osu.Game.Rulesets.Catch.UI
                Scheduler.AddDelayed(beginTrail, HyperDashing ? 25 : 50);
            }

-            private Sprite createCatcherSprite() => new Sprite
-            {
-                Size = new Vector2(CATCHER_SIZE),
-                FillMode = FillMode.Fill,
-                Texture = texture,
-                OriginPosition = new Vector2(-3, 10) // temporary until the sprite is aligned correctly.
-            };
+            private Sprite createCatcherSprite() => new CatcherSprite();

            /// <summary>
            /// Add a caught fruit to the catcher's stack.
@@ -236,63 +238,74 @@ namespace osu.Game.Rulesets.Catch.UI
            /// <returns>Whether the catch is possible.</returns>
            public bool AttemptCatch(CatchHitObject fruit)
            {
-                double halfCatcherWidth = CATCHER_SIZE * Math.Abs(Scale.X) * 0.5f;
+                float halfCatchWidth = CatchWidth * 0.5f;

                // this stuff wil disappear once we move fruit to non-relative coordinate space in the future.
                var catchObjectPosition = fruit.X * CatchPlayfield.BASE_WIDTH;
                var catcherPosition = Position.X * CatchPlayfield.BASE_WIDTH;

                var validCatch =
-                    catchObjectPosition >= catcherPosition - halfCatcherWidth &&
-                    catchObjectPosition <= catcherPosition + halfCatcherWidth;
+                    catchObjectPosition >= catcherPosition - halfCatchWidth &&
+                    catchObjectPosition <= catcherPosition + halfCatchWidth;

                if (validCatch && fruit.HyperDash)
                {
-                    HyperDashModifier = Math.Abs(fruit.HyperDashTarget.X - fruit.X) / Math.Abs(fruit.HyperDashTarget.StartTime - fruit.StartTime) / BASE_SPEED;
-                    HyperDashDirection = fruit.HyperDashTarget.X - fruit.X;
+                    var target = fruit.HyperDashTarget;
+                    double timeDifference = target.StartTime - fruit.StartTime;
+                    double positionDifference = target.X * CatchPlayfield.BASE_WIDTH - catcherPosition;
+                    double velocity = positionDifference / Math.Max(1.0, timeDifference - 1000.0 / 60.0);
+
+                    SetHyperdashState(Math.Abs(velocity), target.X);
                }
                else
-                    HyperDashModifier = 1;
+                {
+                    SetHyperdashState();
+                }

                return validCatch;
            }

+            private double hyperDashModifier = 1;
+            private int hyperDashDirection;
+            private float hyperDashTargetPosition;
+
            /// <summary>
            /// Whether we are hypderdashing or not.
            /// </summary>
            public bool HyperDashing => hyperDashModifier != 1;

-            private double hyperDashModifier = 1;
-
            /// <summary>
-            /// The direction in which hyperdash is allowed. 0 allows both directions.
+            /// Set hyperdash state.
            /// </summary>
-            public double HyperDashDirection;
-
-            /// <summary>
-            /// The speed modifier resultant from hyperdash. Will trigger hyperdash when not equal to 1.
-            /// </summary>
-            public double HyperDashModifier
+            /// <param name="modifier">The speed multiplier. If this is less or equals to 1, this catcher will be non-hyperdashing state.</param>
+            /// <param name="targetPosition">When this catcher crosses this position, this catcher ends hyperdashing.</param>
+            public void SetHyperdashState(double modifier = 1, float targetPosition = -1)
            {
-                get { return hyperDashModifier; }
-                set
+                const float hyperdash_transition_length = 180;
+
+                bool previouslyHyperDashing = HyperDashing;
+                if (modifier <= 1 || X == targetPosition)
                {
-                    if (value == hyperDashModifier) return;
-                    hyperDashModifier = value;
+                    hyperDashModifier = 1;
+                    hyperDashDirection = 0;

-                    const float transition_length = 180;
-
-                    if (HyperDashing)
+                    if (previouslyHyperDashing)
                    {
-                        this.FadeColour(Color4.OrangeRed, transition_length, Easing.OutQuint);
-                        this.FadeTo(0.2f, transition_length, Easing.OutQuint);
-                        Trail = true;
+                        this.FadeColour(Color4.White, hyperdash_transition_length, Easing.OutQuint);
+                        this.FadeTo(1, hyperdash_transition_length, Easing.OutQuint);
                    }
-                    else
+                }
+                else
+                {
+                    hyperDashModifier = modifier;
+                    hyperDashDirection = Math.Sign(targetPosition - X);
+                    hyperDashTargetPosition = targetPosition;
+
+                    if (!previouslyHyperDashing)
                    {
-                        HyperDashDirection = 0;
-                        this.FadeColour(Color4.White, transition_length, Easing.OutQuint);
-                        this.FadeTo(1, transition_length, Easing.OutQuint);
+                        this.FadeColour(Color4.OrangeRed, hyperdash_transition_length, Easing.OutQuint);
+                        this.FadeTo(0.2f, hyperdash_transition_length, Easing.OutQuint);
+                        Trail = true;
                    }
                }
            }
@@ -347,12 +360,18 @@ namespace osu.Game.Rulesets.Catch.UI
                var direction = Math.Sign(currentDirection);

                double dashModifier = Dashing ? 1 : 0.5;
-
-                if (hyperDashModifier != 1 && (HyperDashDirection == 0 || direction == Math.Sign(HyperDashDirection)))
-                    dashModifier = hyperDashModifier;
+                double speed = BASE_SPEED * dashModifier * hyperDashModifier;

                Scale = new Vector2(Math.Abs(Scale.X) * direction, Scale.Y);
-                X = (float)MathHelper.Clamp(X + direction * Clock.ElapsedFrameTime * BASE_SPEED * dashModifier, 0, 1);
+                X = (float)MathHelper.Clamp(X + direction * Clock.ElapsedFrameTime * speed, 0, 1);
+
+                // Correct overshooting.
+                if (hyperDashDirection > 0 && hyperDashTargetPosition < X ||
+                    hyperDashDirection < 0 && hyperDashTargetPosition > X)
+                {
+                    X = hyperDashTargetPosition;
+                    SetHyperdashState();
+                }
            }

            /// <summary>
@@ -388,27 +407,47 @@ namespace osu.Game.Rulesets.Catch.UI
                var fruit = caughtFruit.ToArray();

                foreach (var f in fruit)
+                    Explode(f);
+            }
+
+            public void Explode(DrawableHitObject fruit)
+            {
+                var originalX = fruit.X * Scale.X;
+
+                if (ExplodingFruitTarget != null)
                {
-                    var originalX = f.X * Scale.X;
+                    fruit.Anchor = Anchor.TopLeft;
+                    fruit.Position = caughtFruit.ToSpaceOfOtherDrawable(fruit.DrawPosition, ExplodingFruitTarget);

-                    if (ExplodingFruitTarget != null)
-                    {
-                        f.Anchor = Anchor.TopLeft;
-                        f.Position = caughtFruit.ToSpaceOfOtherDrawable(f.DrawPosition, ExplodingFruitTarget);
+                    caughtFruit.Remove(fruit);

-                        caughtFruit.Remove(f);
+                    ExplodingFruitTarget.Add(fruit);
+                }

-                        ExplodingFruitTarget.Add(f);
-                    }
+                fruit.MoveToY(fruit.Y - 50, 250, Easing.OutSine)
+                 .Then()
+                 .MoveToY(fruit.Y + 50, 500, Easing.InSine);

-                    f.MoveToY(f.Y - 50, 250, Easing.OutSine)
-                     .Then()
-                     .MoveToY(f.Y + 50, 500, Easing.InSine);
+                fruit.MoveToX(fruit.X + originalX * 6, 1000);
+                fruit.FadeOut(750);

-                    f.MoveToX(f.X + originalX * 6, 1000);
-                    f.FadeOut(750);
+                fruit.Expire();
+            }

-                    f.Expire();
+            private class CatcherSprite : Sprite
+            {
+                public CatcherSprite()
+                {
+                    Size = new Vector2(CATCHER_SIZE);
+
+                    // Sets the origin roughly to the centre of the catcher's plate to allow for correct scaling.
+                    OriginPosition = new Vector2(-0.02f, 0.06f) * CATCHER_SIZE;
+                }
+
+                [BackgroundDependencyLoader]
+                private void load(TextureStore textures)
+                {
+                    Texture = textures.Get(@"Play/Catch/fruit-catcher-idle");
                }
            }
        }
@@ -22,7 +22,7 @@
            },
            "type": "mono",
            "request": "launch",
-            "program": "${workspaceRoot}/bin/Debug/net471/osu.Game.Rulesets.Mania.Tests.exe",
+            "program": "${workspaceRoot}/bin/Release/net471/osu.Game.Rulesets.Mania.Tests.exe",
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Release, msbuild)",
            "runtimeExecutable": null,
@@ -30,12 +30,12 @@
            "console": "internalConsole"
        },
        {
-            "name": "VisualTests (Debug, netcoreapp2.0)",
+            "name": "VisualTests (Debug, netcoreapp2.1)",
            "type": "coreclr",
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/bin/Debug/netcoreapp2.0/osu.Game.Rulesets.Mania.Tests.dll"
+                "${workspaceRoot}/bin/Debug/netcoreapp2.1/osu.Game.Rulesets.Mania.Tests.dll"
            ],
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Debug, dotnet)",
@@ -43,12 +43,12 @@
            "console": "internalConsole"
        },
        {
-            "name": "VisualTests (Release, netcoreapp2.0)",
+            "name": "VisualTests (Release, netcoreapp2.1)",
            "type": "coreclr",
            "request": "launch",
            "program": "dotnet",
            "args": [
-                "${workspaceRoot}/bin/Debug/netcoreapp2.0/osu.Game.Rulesets.Mania.Tests.dll"
+                "${workspaceRoot}/bin/Release/netcoreapp2.1/osu.Game.Rulesets.Mania.Tests.dll"
            ],
            "cwd": "${workspaceRoot}",
            "preLaunchTask": "Build (Release, dotnet)",
@@ -40,7 +40,7 @@
                "build",
                "--no-restore",
                "osu.Game.Rulesets.Mania.Tests.csproj",
-                "/p:TargetFramework=netcoreapp2.0",
+                "/p:TargetFramework=netcoreapp2.1",
                "/p:GenerateFullPaths=true",
                "/m",
                "/verbosity:m"
@@ -56,7 +56,7 @@
                "build",
                "--no-restore",
                "osu.Game.Rulesets.Mania.Tests.csproj",
-                "/p:TargetFramework=netcoreapp2.0",
+                "/p:TargetFramework=netcoreapp2.1",
                "/p:Configuration=Release",
                "/p:GenerateFullPaths=true",
                "/m",
@@ -75,7 +75,7 @@
            "problemMatcher": []
        },
        {
-            "label": "Restore (netcoreapp2.0)",
+            "label": "Restore (netcoreapp2.1)",
            "type": "shell",
            "command": "dotnet",
            "args": [
@@ -5,8 +5,6 @@ using System;
 using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Framework.MathUtils;
-using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -14,7 +12,7 @@ using osu.Game.Tests.Beatmaps;

 namespace osu.Game.Rulesets.Mania.Tests
 {
-    public class ManiaBeatmapConversionTest : BeatmapConversionTest<TestManiaRuleset, ConvertValue>
+    internal class ManiaBeatmapConversionTest : BeatmapConversionTest<ConvertValue>
    {
        protected override string ResourceAssembly => "osu.Game.Rulesets.Mania";

@@ -35,10 +33,10 @@ namespace osu.Game.Rulesets.Mania.Tests
            };
        }

-        protected override IBeatmapConverter CreateConverter(IBeatmap beatmap) => new ManiaBeatmapConverter(beatmap);
+        protected override Ruleset CreateRuleset() => new ManiaRuleset();
    }

-    public struct ConvertValue : IEquatable<ConvertValue>
+    internal struct ConvertValue : IEquatable<ConvertValue>
    {
        /// <summary>
        /// A sane value to account for osu!stable using ints everwhere.
@@ -54,8 +52,4 @@ namespace osu.Game.Rulesets.Mania.Tests
               && Precision.AlmostEquals(EndTime, other.EndTime, conversion_lenience)
               && Column == other.Column;
    }
-
-    public class TestManiaRuleset : ManiaRuleset
-    {
-    }
 }
@@ -0,0 +1,45 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Bindings;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    public abstract class ManiaInputTestCase : OsuTestCase
+    {
+        private readonly Container<Drawable> content;
+        protected override Container<Drawable> Content => content ?? base.Content;
+
+        protected ManiaInputTestCase(int keys)
+        {
+            base.Content.Add(content = new LocalInputManager(keys));
+        }
+
+        private class LocalInputManager : ManiaInputManager
+        {
+            public LocalInputManager(int variant)
+                : base(new ManiaRuleset().RulesetInfo, variant)
+            {
+            }
+
+            protected override RulesetKeyBindingContainer CreateKeyBindingContainer(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique)
+                => new LocalKeyBindingContainer(ruleset, variant, unique);
+
+            private class LocalKeyBindingContainer : RulesetKeyBindingContainer
+            {
+                public LocalKeyBindingContainer(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique)
+                    : base(ruleset, variant, unique)
+                {
+                }
+
+                protected override void ReloadMappings()
+                {
+                    KeyBindings = DefaultKeyBindings;
+                }
+            }
+        }
+    }
+}
@@ -0,0 +1,37 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Configuration;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    /// <summary>
+    /// A container which provides a <see cref="IScrollingInfo"/> to children.
+    /// </summary>
+    public class ScrollingTestContainer : Container
+    {
+        private readonly ScrollingDirection direction;
+
+        public ScrollingTestContainer(ScrollingDirection direction)
+        {
+            this.direction = direction;
+        }
+
+        protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent)
+        {
+            var dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
+            dependencies.CacheAs<IScrollingInfo>(new ScrollingInfo { Direction = { Value = direction }});
+            return dependencies;
+        }
+
+        private class ScrollingInfo : IScrollingInfo
+        {
+            public readonly Bindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
+            IBindable<ScrollingDirection> IScrollingInfo.Direction => Direction;
+        }
+    }
+}
@@ -0,0 +1,111 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.Mania.UI.Components;
+using osu.Game.Rulesets.UI.Scrolling;
+using OpenTK;
+using OpenTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    [TestFixture]
+    public class TestCaseColumn : ManiaInputTestCase
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(Column),
+            typeof(ColumnBackground),
+            typeof(ColumnKeyArea),
+            typeof(ColumnHitObjectArea)
+        };
+
+        private readonly List<Column> columns = new List<Column>();
+
+        public TestCaseColumn()
+            : base(2)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Spacing = new Vector2(20, 0),
+                Children = new[]
+                {
+                    createColumn(ScrollingDirection.Up, ManiaAction.Key1),
+                    createColumn(ScrollingDirection.Down, ManiaAction.Key2)
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            AddStep("note", createNote);
+            AddStep("hold note", createHoldNote);
+        }
+
+        private void createNote()
+        {
+            for (int i = 0; i < columns.Count; i++)
+            {
+                var obj = new Note { Column = i, StartTime = Time.Current + 2000 };
+                obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+
+                columns[i].Add(new DrawableNote(obj, columns[i].Action));
+            }
+        }
+
+        private void createHoldNote()
+        {
+            for (int i = 0; i < columns.Count; i++)
+            {
+                var obj = new HoldNote { Column = i, StartTime = Time.Current + 2000, Duration = 500 };
+                obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+
+                columns[i].Add(new DrawableHoldNote(obj, columns[i].Action));
+            }
+        }
+
+        private Drawable createColumn(ScrollingDirection direction, ManiaAction action)
+        {
+            var column = new Column(direction)
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Height = 0.85f,
+                AccentColour = Color4.OrangeRed,
+                Action = action,
+                VisibleTimeRange = { Value = 2000 }
+            };
+
+            columns.Add(column);
+
+            return new ScrollingTestContainer(direction)
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                AutoSizeAxes = Axes.X,
+                RelativeSizeAxes = Axes.Y,
+                Child = column
+            };
+        }
+    }
+}
@@ -1,96 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using NUnit.Framework;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.Mania.Objects.Drawables;
-using osu.Game.Tests.Visual;
-using OpenTK;
-using OpenTK.Graphics;
-
-namespace osu.Game.Rulesets.Mania.Tests
-{
-    [TestFixture]
-    public class TestCaseManiaHitObjects : OsuTestCase
-    {
-        public TestCaseManiaHitObjects()
-        {
-            Add(new FillFlowContainer
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                RelativeSizeAxes = Axes.Y,
-                Direction = FillDirection.Horizontal,
-                Spacing = new Vector2(10, 0),
-                // Imagine that the containers containing the drawable notes are the "columns"
-                Children = new Drawable[]
-                {
-                    new Container
-                    {
-                        Name = "Normal note column",
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        RelativeSizeAxes = Axes.Y,
-                        Width = 50,
-                        Children = new[]
-                        {
-                            new Container
-                            {
-                                Name = "Timing section",
-                                RelativeSizeAxes = Axes.Both,
-                                RelativeChildSize = new Vector2(1, 10000),
-                                Children = new[]
-                                {
-                                    new DrawableNote(new Note(), ManiaAction.Key1)
-                                    {
-                                        Y = 5000,
-                                        LifetimeStart = double.MinValue,
-                                        LifetimeEnd = double.MaxValue,
-                                        AccentColour = Color4.Red
-                                    },
-                                    new DrawableNote(new Note(), ManiaAction.Key1)
-                                    {
-                                        Y = 6000,
-                                        LifetimeStart = double.MinValue,
-                                        LifetimeEnd = double.MaxValue,
-                                        AccentColour = Color4.Red
-                                    }
-                                }
-                            }
-                        }
-                    },
-                    new Container
-                    {
-                        Name = "Hold note column",
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        RelativeSizeAxes = Axes.Y,
-                        Width = 50,
-                        Children = new[]
-                        {
-                            new Container
-                            {
-                                Name = "Timing section",
-                                RelativeSizeAxes = Axes.Both,
-                                RelativeChildSize = new Vector2(1, 10000),
-                                Children = new[]
-                                {
-                                    new DrawableHoldNote(new HoldNote { Duration = 1000 } , ManiaAction.Key1)
-                                    {
-                                        Y = 5000,
-                                        Height = 1000,
-                                        LifetimeStart = double.MinValue,
-                                        LifetimeEnd = double.MaxValue,
-                                        AccentColour = Color4.Red
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            });
-        }
-    }
-}
@@ -1,193 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using NUnit.Framework;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Timing;
-using osu.Game.Configuration;
-using osu.Game.Rulesets.Mania.Beatmaps;
-using osu.Game.Rulesets.Mania.Configuration;
-using osu.Game.Rulesets.Mania.Judgements;
-using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.Mania.Objects.Drawables;
-using osu.Game.Rulesets.Mania.UI;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Tests.Visual;
-
-namespace osu.Game.Rulesets.Mania.Tests
-{
-    [TestFixture]
-    public class TestCaseManiaPlayfield : OsuTestCase
-    {
-        private const double start_time = 500;
-        private const double duration = 500;
-
-        protected override double TimePerAction => 200;
-
-        private RulesetInfo maniaRuleset;
-
-        public TestCaseManiaPlayfield()
-        {
-            var rng = new Random(1337);
-
-            AddStep("1 column", () => createPlayfield(1));
-            AddStep("4 columns", () => createPlayfield(4));
-            AddStep("5 columns", () => createPlayfield(5));
-            AddStep("8 columns", () => createPlayfield(8));
-            AddStep("4 + 4 columns", () =>
-            {
-                var stages = new List<StageDefinition>
-                {
-                    new StageDefinition { Columns = 4 },
-                    new StageDefinition { Columns = 4 },
-                };
-                createPlayfield(stages);
-            });
-
-            AddStep("2 + 4 + 2 columns", () =>
-            {
-                var stages = new List<StageDefinition>
-                {
-                    new StageDefinition { Columns = 2 },
-                    new StageDefinition { Columns = 4 },
-                    new StageDefinition { Columns = 2 },
-                };
-                createPlayfield(stages);
-            });
-
-            AddStep("1 + 8 + 1 columns", () =>
-            {
-                var stages = new List<StageDefinition>
-                {
-                    new StageDefinition { Columns = 1 },
-                    new StageDefinition { Columns = 8 },
-                    new StageDefinition { Columns = 1 },
-                };
-                createPlayfield(stages);
-            });
-
-            AddStep("Reversed", () => createPlayfield(4, true));
-
-            AddStep("Notes with input", () => createPlayfieldWithNotes());
-            AddStep("Notes with input (reversed)", () => createPlayfieldWithNotes(true));
-            AddStep("Notes with gravity", () => createPlayfieldWithNotes());
-            AddStep("Notes with gravity (reversed)", () => createPlayfieldWithNotes(true));
-
-            AddStep("Hit explosion", () =>
-            {
-                var playfield = createPlayfield(4);
-
-                int col = rng.Next(0, 4);
-
-                var note = new DrawableNote(new Note { Column = col }, ManiaAction.Key1)
-                {
-                    AccentColour = playfield.Columns.ElementAt(col).AccentColour
-                };
-
-                playfield.OnJudgement(note, new ManiaJudgement { Result = HitResult.Perfect });
-                playfield.Columns[col].OnJudgement(note, new ManiaJudgement { Result = HitResult.Perfect });
-            });
-        }
-
-        private DependencyContainer dependencies;
-
-        protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent)
-            => dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
-
-        [BackgroundDependencyLoader]
-        private void load(RulesetStore rulesets, SettingsStore settings)
-        {
-            maniaRuleset = rulesets.GetRuleset(3);
-
-            dependencies.Cache(new ManiaConfigManager(settings, maniaRuleset, 4));
-        }
-
-        private ManiaPlayfield createPlayfield(int cols, bool inverted = false)
-        {
-            var stages = new List<StageDefinition>
-            {
-                new StageDefinition { Columns = cols },
-            };
-
-            return createPlayfield(stages, inverted);
-        }
-
-        private ManiaPlayfield createPlayfield(List<StageDefinition> stages, bool inverted = false)
-        {
-            Clear();
-
-            var inputManager = new ManiaInputManager(maniaRuleset, stages.Sum(g => g.Columns)) { RelativeSizeAxes = Axes.Both };
-            Add(inputManager);
-
-            ManiaPlayfield playfield;
-
-            inputManager.Add(playfield = new ManiaPlayfield(stages)
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-            });
-
-            playfield.Inverted.Value = inverted;
-
-            return playfield;
-        }
-
-        private void createPlayfieldWithNotes(bool inverted = false)
-        {
-            Clear();
-
-            var rateAdjustClock = new StopwatchClock(true) { Rate = 1 };
-
-            var inputManager = new ManiaInputManager(maniaRuleset, 4) { RelativeSizeAxes = Axes.Both };
-            Add(inputManager);
-
-            ManiaPlayfield playfield;
-            var stages = new List<StageDefinition>
-            {
-                new StageDefinition { Columns = 4 },
-            };
-
-            inputManager.Add(playfield = new ManiaPlayfield(stages)
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Clock = new FramedClock(rateAdjustClock)
-            });
-
-            playfield.Inverted.Value = inverted;
-
-            for (double t = start_time; t <= start_time + duration; t += 100)
-            {
-                playfield.Add(new DrawableNote(new Note
-                {
-                    StartTime = t,
-                    Column = 0
-                }, ManiaAction.Key1));
-
-                playfield.Add(new DrawableNote(new Note
-                {
-                    StartTime = t,
-                    Column = 3
-                }, ManiaAction.Key4));
-            }
-
-            playfield.Add(new DrawableHoldNote(new HoldNote
-            {
-                StartTime = start_time,
-                Duration = duration,
-                Column = 1
-            }, ManiaAction.Key2));
-
-            playfield.Add(new DrawableHoldNote(new HoldNote
-            {
-                StartTime = start_time,
-                Duration = duration,
-                Column = 2
-            }, ManiaAction.Key3));
-        }
-    }
-}
@@ -0,0 +1,168 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+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.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Tests.Visual;
+using OpenTK;
+using OpenTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    [TestFixture]
+    public class TestCaseNotes : OsuTestCase
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(DrawableNote),
+            typeof(DrawableHoldNote)
+        };
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = new FillFlowContainer
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Horizontal,
+                Spacing = new Vector2(20),
+                Children = new[]
+                {
+                    createNoteDisplay(ScrollingDirection.Down),
+                    createNoteDisplay(ScrollingDirection.Up),
+                    createHoldNoteDisplay(ScrollingDirection.Down),
+                    createHoldNoteDisplay(ScrollingDirection.Up),
+                }
+            };
+        }
+
+        private Drawable createNoteDisplay(ScrollingDirection direction)
+        {
+            var note = new Note { StartTime = 999999999 };
+            note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+
+            return new ScrollingTestContainer(direction)
+            {
+                AutoSizeAxes = Axes.Both,
+                Child = new NoteContainer(direction, $"note, scrolling {direction.ToString().ToLower()}")
+                {
+                    Child = new DrawableNote(note, ManiaAction.Key1) { AccentColour = Color4.OrangeRed }
+                }
+            };
+        }
+
+        private Drawable createHoldNoteDisplay(ScrollingDirection direction)
+        {
+            var note = new HoldNote { StartTime = 999999999, Duration = 1000 };
+            note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+
+            return new ScrollingTestContainer(direction)
+            {
+                AutoSizeAxes = Axes.Both,
+                Child = new NoteContainer(direction, $"hold note, scrolling {direction.ToString().ToLower()}")
+                {
+                    Child = new DrawableHoldNote(note, ManiaAction.Key1)
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        AccentColour = Color4.OrangeRed,
+                    }
+                }
+            };
+        }
+
+        private class NoteContainer : Container
+        {
+            private readonly Container content;
+            protected override Container<Drawable> Content => content;
+
+            private readonly ScrollingDirection direction;
+
+            public NoteContainer(ScrollingDirection direction, string description)
+            {
+                this.direction = direction;
+                AutoSizeAxes = Axes.Both;
+
+                InternalChild = new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Spacing = new Vector2(0, 10),
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
+                    {
+                        new Container
+                        {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            Width = 45,
+                            Height = 100,
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    Anchor = Anchor.TopCentre,
+                                    Origin = Anchor.TopCentre,
+                                    RelativeSizeAxes = Axes.Both,
+                                    Width = 1.25f,
+                                    Colour = Color4.Black.Opacity(0.5f)
+                                },
+                                content = new Container { RelativeSizeAxes = Axes.Both }
+                            }
+                        },
+                        new SpriteText
+                        {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            TextSize = 14,
+                            Text = description
+                        }
+                    }
+                };
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+
+                foreach (var obj in content.OfType<DrawableHitObject>())
+                {
+                    if (!(obj.HitObject is IHasEndTime endTime))
+                        continue;
+
+                    if (!obj.HasNestedHitObjects)
+                        continue;
+
+                    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;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
@@ -1,16 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using NUnit.Framework;
-
-namespace osu.Game.Rulesets.Mania.Tests
-{
-    [TestFixture]
-    public class TestCasePerformancePoints : Game.Tests.Visual.TestCasePerformancePoints
-    {
-        public TestCasePerformancePoints()
-            : base(new ManiaRuleset())
-        {
-        }
-    }
-}
@@ -0,0 +1,121 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Collections.Generic;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+using OpenTK;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    [TestFixture]
+    public class TestCaseStage : ManiaInputTestCase
+    {
+        private const int columns = 4;
+
+        private readonly List<ManiaStage> stages = new List<ManiaStage>();
+
+        public TestCaseStage()
+            : base(columns)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Spacing = new Vector2(20, 0),
+                Children = new[]
+                {
+                    createStage(ScrollingDirection.Up, ManiaAction.Key1),
+                    createStage(ScrollingDirection.Down, ManiaAction.Key3)
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            AddStep("note", createNote);
+            AddStep("hold note", createHoldNote);
+            AddStep("minor bar line", () => createBarLine(false));
+            AddStep("major bar line", () => createBarLine(true));
+        }
+
+        private void createNote()
+        {
+            foreach (var stage in stages)
+            {
+                for (int i = 0; i < stage.Columns.Count; i++)
+                {
+                    var obj = new Note { Column = i, StartTime = Time.Current + 2000 };
+                    obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+
+                    stage.Add(new DrawableNote(obj, stage.Columns[i].Action));
+                }
+            }
+        }
+
+        private void createHoldNote()
+        {
+            foreach (var stage in stages)
+            {
+                for (int i = 0; i < stage.Columns.Count; i++)
+                {
+                    var obj = new HoldNote { Column = i, StartTime = Time.Current + 2000, Duration = 500 };
+                    obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+
+                    stage.Add(new DrawableHoldNote(obj, stage.Columns[i].Action));
+                }
+            }
+        }
+
+        private void createBarLine(bool major)
+        {
+            foreach (var stage in stages)
+            {
+                var obj = new BarLine
+                {
+                    StartTime = Time.Current + 2000,
+                    ControlPoint = new TimingControlPoint(),
+                    BeatIndex = major ? 0 : 1
+                };
+
+                obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+
+                stage.Add(obj);
+            }
+        }
+
+        private Drawable createStage(ScrollingDirection direction, ManiaAction action)
+        {
+            var specialAction = ManiaAction.Special1;
+
+            var stage = new ManiaStage(direction, 0, new StageDefinition { Columns = 2 }, ref action, ref specialAction) { VisibleTimeRange = { Value = 2000 } };
+            stages.Add(stage);
+
+            return new ScrollingTestContainer(direction)
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.Y,
+                AutoSizeAxes = Axes.X,
+                Child = stage
+            };
+        }
+    }
+}
@@ -2,7 +2,7 @@
  <Import Project="..\osu.TestProject.props" />
  <PropertyGroup Label="Project">
    <OutputType>WinExe</OutputType>
-    <TargetFrameworks>netcoreapp2.0;net471</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;net471</TargetFrameworks>
  </PropertyGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj" />
@@ -59,7 +59,6 @@ namespace osu.Game.Rulesets.Mania.Beatmaps

        protected override Beatmap<ManiaHitObject> ConvertBeatmap(IBeatmap original)
        {
-
            BeatmapDifficulty difficulty = original.BeatmapInfo.BaseDifficulty;

            int seed = (int)Math.Round(difficulty.DrainRate + difficulty.CircleSize) * 20 + (int)(difficulty.OverallDifficulty * 41.2) + (int)Math.Round(difficulty.ApproachRate);
@@ -58,6 +58,13 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy

        public override Pattern Generate()
        {
+            if (TotalColumns == 1)
+            {
+                var pattern = new Pattern();
+                addToPattern(pattern, 0, HitObject.StartTime, endTime);
+                return pattern;
+            }
+
            if (spanCount > 1)
            {
                if (segmentDuration <= 90)
@@ -322,7 +329,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                    break;
            }

-            bool isDoubleSample(SampleInfo sample) => sample.Name == SampleInfo.HIT_CLAP && sample.Name == SampleInfo.HIT_FINISH;
+            bool isDoubleSample(SampleInfo sample) => sample.Name == SampleInfo.HIT_CLAP || sample.Name == SampleInfo.HIT_FINISH;

            bool canGenerateTwoNotes = (convertType & PatternType.LowProbability) == 0;
            canGenerateTwoNotes &= HitObject.Samples.Any(isDoubleSample) || sampleInfoListAt(HitObject.StartTime).Any(isDoubleSample);
@@ -77,10 +77,25 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
            }
            else
                convertType |= PatternType.LowProbability;
+
+            if ((convertType & PatternType.KeepSingle) == 0)
+            {
+                if (HitObject.Samples.Any(s => s.Name == SampleInfo.HIT_FINISH) && TotalColumns != 8)
+                    convertType |= PatternType.Mirror;
+                else
+                    convertType |= PatternType.Gathered;
+            }
        }

        public override Pattern Generate()
        {
+            if (TotalColumns == 1)
+            {
+                var pattern = new Pattern();
+                addToPattern(pattern, 0);
+                return pattern;
+            }
+
            int lastColumn = PreviousPattern.HitObjects.FirstOrDefault()?.Column ?? 0;

            if ((convertType & PatternType.Reverse) > 0 && PreviousPattern.HitObjects.Any())
@@ -346,7 +361,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
            addToCentre = false;

            if ((convertType & PatternType.ForceNotStack) > 0)
-                return getRandomNoteCount(p2 / 2, p2, (p2 + p3) / 2, p3);
+                return getRandomNoteCount(1 / 2f + p2 / 2, p2, (p2 + p3) / 2, p3);

            switch (TotalColumns)
            {
@@ -4,12 +4,13 @@
 using osu.Framework.Configuration.Tracking;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Configuration;
+using osu.Game.Rulesets.Mania.UI;

 namespace osu.Game.Rulesets.Mania.Configuration
 {
    public class ManiaConfigManager : RulesetConfigManager<ManiaSetting>
    {
-        public ManiaConfigManager(SettingsStore settings, RulesetInfo ruleset, int variant)
+        public ManiaConfigManager(SettingsStore settings, RulesetInfo ruleset, int? variant = null)
            : base(settings, ruleset, variant)
        {
        }
@@ -19,6 +20,7 @@ namespace osu.Game.Rulesets.Mania.Configuration
            base.InitialiseDefaults();

            Set(ManiaSetting.ScrollTime, 1500.0, 50.0, 10000.0, 50.0);
+            Set(ManiaSetting.ScrollDirection, ManiaScrollingDirection.Down);
        }

        public override TrackedSettings CreateTrackedSettings() => new TrackedSettings
@@ -29,6 +31,7 @@ namespace osu.Game.Rulesets.Mania.Configuration

    public enum ManiaSetting
    {
-        ScrollTime
+        ScrollTime,
+        ScrollDirection
    }
 }
@@ -0,0 +1,18 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Mania.Difficulty
+{
+    public class ManiaDifficultyAttributes : DifficultyAttributes
+    {
+        public double GreatHitWindow;
+
+        public ManiaDifficultyAttributes(Mod[] mods, double starRating)
+            : base(mods, starRating)
+        {
+        }
+    }
+}
@@ -1,14 +1,17 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

-using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Mania.Beatmaps;
-using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.Mods;
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.Mods;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mods;

-namespace osu.Game.Rulesets.Mania
+namespace osu.Game.Rulesets.Mania.Difficulty
 {
    internal class ManiaDifficultyCalculator : DifficultyCalculator
    {
@@ -26,48 +29,44 @@ namespace osu.Game.Rulesets.Mania
        /// </summary>
        private const double decay_weight = 0.9;

-        /// <summary>
-        /// HitObjects are stored as a member variable.
-        /// </summary>
-        private readonly List<ManiaHitObjectDifficulty> difficultyHitObjects = new List<ManiaHitObjectDifficulty>();
+        private readonly bool isForCurrentRuleset;

-        public ManiaDifficultyCalculator(IBeatmap beatmap)
-            : base(beatmap)
+        public ManiaDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)
+            : base(ruleset, beatmap)
        {
+            isForCurrentRuleset = beatmap.BeatmapInfo.Ruleset.Equals(ruleset.RulesetInfo);
        }

-        public ManiaDifficultyCalculator(IBeatmap beatmap, Mod[] mods)
-            : base(beatmap, mods)
+        protected override DifficultyAttributes Calculate(IBeatmap beatmap, Mod[] mods, double timeRate)
        {
-        }
+            if (!beatmap.HitObjects.Any())
+                return new ManiaDifficultyAttributes(mods, 0);

-        public override double Calculate(Dictionary<string, double> categoryDifficulty = null)
-        {
-            // Fill our custom DifficultyHitObject class, that carries additional information
-            difficultyHitObjects.Clear();
+            var difficultyHitObjects = new List<ManiaHitObjectDifficulty>();

-            int columnCount = (Beatmap as ManiaBeatmap)?.TotalColumns ?? 7;
-
-            foreach (var hitObject in Beatmap.HitObjects)
-                difficultyHitObjects.Add(new ManiaHitObjectDifficulty((ManiaHitObject)hitObject, columnCount));
+            int columnCount = ((ManiaBeatmap)beatmap).TotalColumns;

            // Sort DifficultyHitObjects by StartTime of the HitObjects - just to make sure.
-            difficultyHitObjects.Sort((a, b) => a.BaseHitObject.StartTime.CompareTo(b.BaseHitObject.StartTime));
+            // Note: Stable sort is done so that the ordering of hitobjects with equal start times doesn't change
+            difficultyHitObjects.AddRange(beatmap.HitObjects.Select(h => new ManiaHitObjectDifficulty((ManiaHitObject)h, columnCount)).OrderBy(h => h.BaseHitObject.StartTime));

-            if (!calculateStrainValues())
-                return 0;
+            if (!calculateStrainValues(difficultyHitObjects, timeRate))
+                return new DifficultyAttributes(mods, 0);

-            double starRating = calculateDifficulty() * star_scaling_factor;

-            categoryDifficulty?.Add("Strain", starRating);
+            double starRating = calculateDifficulty(difficultyHitObjects, timeRate) * star_scaling_factor;

-            return starRating;
+            return new ManiaDifficultyAttributes(mods, starRating)
+            {
+                // Todo: This int cast is temporary to achieve 1:1 results with osu!stable, and should be remoevd in the future
+                GreatHitWindow = (int)(beatmap.HitObjects.First().HitWindows.Great / 2) / timeRate
+            };
        }

-        private bool calculateStrainValues()
+        private bool calculateStrainValues(List<ManiaHitObjectDifficulty> objects, double timeRate)
        {
            // Traverse hitObjects in pairs to calculate the strain value of NextHitObject from the strain value of CurrentHitObject and environment.
-            using (List<ManiaHitObjectDifficulty>.Enumerator hitObjectsEnumerator = difficultyHitObjects.GetEnumerator())
+            using (var hitObjectsEnumerator = objects.GetEnumerator())
            {
                if (!hitObjectsEnumerator.MoveNext())
                    return false;
@@ -78,7 +77,7 @@ namespace osu.Game.Rulesets.Mania
                while (hitObjectsEnumerator.MoveNext())
                {
                    var next = hitObjectsEnumerator.Current;
-                    next?.CalculateStrains(current, TimeRate);
+                    next?.CalculateStrains(current, timeRate);
                    current = next;
                }

@@ -86,9 +85,9 @@ namespace osu.Game.Rulesets.Mania
            }
        }

-        private double calculateDifficulty()
+        private double calculateDifficulty(List<ManiaHitObjectDifficulty> objects, double timeRate)
        {
-            double actualStrainStep = strain_step * TimeRate;
+            double actualStrainStep = strain_step * timeRate;

            // Find the highest strain value within each strain step
            List<double> highestStrains = new List<double>();
@@ -96,7 +95,7 @@ namespace osu.Game.Rulesets.Mania
            double maximumStrain = 0; // We need to keep track of the maximum strain in the current interval

            ManiaHitObjectDifficulty previousHitObject = null;
-            foreach (var hitObject in difficultyHitObjects)
+            foreach (var hitObject in objects)
            {
                // While we are beyond the current interval push the currently available maximum to our strain list
                while (hitObject.BaseHitObject.StartTime > intervalEndTime)
@@ -140,5 +139,36 @@ namespace osu.Game.Rulesets.Mania

            return difficulty;
        }
+
+        protected override Mod[] DifficultyAdjustmentMods
+        {
+            get
+            {
+                var mods = new Mod[]
+                {
+                    new ManiaModDoubleTime(),
+                    new ManiaModHalfTime(),
+                    new ManiaModEasy(),
+                    new ManiaModHardRock(),
+                };
+
+                if (isForCurrentRuleset)
+                    return mods;
+
+                // if we are a convert, we can be played in any key mod.
+                return mods.Concat(new Mod[]
+                {
+                    new ManiaModKey1(),
+                    new ManiaModKey2(),
+                    new ManiaModKey3(),
+                    new ManiaModKey4(),
+                    new ManiaModKey5(),
+                    new ManiaModKey6(),
+                    new ManiaModKey7(),
+                    new ManiaModKey8(),
+                    new ManiaModKey9(),
+                }).ToArray();
+            }
+        }
    }
 }
@@ -0,0 +1,127 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Mania.Difficulty
+{
+    public class ManiaPerformanceCalculator : PerformanceCalculator
+    {
+        protected new ManiaDifficultyAttributes Attributes => (ManiaDifficultyAttributes)base.Attributes;
+
+        private Mod[] mods;
+
+        // Score after being scaled by non-difficulty-increasing mods
+        private double scaledScore;
+
+        private int countPerfect;
+        private int countGreat;
+        private int countGood;
+        private int countOk;
+        private int countMeh;
+        private int countMiss;
+
+        public ManiaPerformanceCalculator(Ruleset ruleset, WorkingBeatmap beatmap, Score score)
+            : base(ruleset, beatmap, score)
+        {
+        }
+
+        public override double Calculate(Dictionary<string, double> categoryDifficulty = null)
+        {
+            mods = Score.Mods;
+            scaledScore = Score.TotalScore;
+            countPerfect = Convert.ToInt32(Score.Statistics[HitResult.Perfect]);
+            countGreat = Convert.ToInt32(Score.Statistics[HitResult.Great]);
+            countGood = Convert.ToInt32(Score.Statistics[HitResult.Good]);
+            countOk = Convert.ToInt32(Score.Statistics[HitResult.Ok]);
+            countMeh = Convert.ToInt32(Score.Statistics[HitResult.Meh]);
+            countMiss = Convert.ToInt32(Score.Statistics[HitResult.Miss]);
+
+            if (mods.Any(m => !m.Ranked))
+                return 0;
+
+            IEnumerable<Mod> scoreIncreaseMods = Ruleset.GetModsFor(ModType.DifficultyIncrease);
+
+            double scoreMultiplier = 1.0;
+            foreach (var m in mods.Where(m => !scoreIncreaseMods.Contains(m)))
+                scoreMultiplier *= m.ScoreMultiplier;
+
+            // Scale score up, so it's comparable to other keymods
+            scaledScore *= 1.0 / scoreMultiplier;
+
+            // Arbitrary initial value for scaling pp in order to standardize distributions across game modes.
+            // The specific number has no intrinsic meaning and can be adjusted as needed.
+            double multiplier = 0.8;
+
+            if (mods.Any(m => m is ModNoFail))
+                multiplier *= 0.9;
+            if (mods.Any(m => m is ModEasy))
+                multiplier *= 0.5;
+
+            double strainValue = computeStrainValue();
+            double accValue = computeAccuracyValue(strainValue);
+            double totalValue =
+                Math.Pow(
+                    Math.Pow(strainValue, 1.1) +
+                    Math.Pow(accValue, 1.1), 1.0 / 1.1
+                ) * multiplier;
+
+            if (categoryDifficulty != null)
+            {
+                categoryDifficulty["Strain"] = strainValue;
+                categoryDifficulty["Accuracy"] = accValue;
+            }
+
+            return totalValue;
+        }
+
+        private double computeStrainValue()
+        {
+            // Obtain strain difficulty
+            double strainValue = Math.Pow(5 * Math.Max(1, Attributes.StarRating / 0.2) - 4.0, 2.2) / 135.0;
+
+            // Longer maps are worth more
+            strainValue *= 1.0 + 0.1 * Math.Min(1.0, totalHits / 1500.0);
+
+            if (scaledScore <= 500000)
+                strainValue = 0;
+            else if (scaledScore <= 600000)
+                strainValue *= (scaledScore - 500000) / 100000 * 0.3;
+            else if (scaledScore <= 700000)
+                strainValue *= 0.3 + (scaledScore - 600000) / 100000 * 0.25;
+            else if (scaledScore <= 800000)
+                strainValue *= 0.55 + (scaledScore - 700000) / 100000 * 0.20;
+            else if (scaledScore <= 900000)
+                strainValue *= 0.75 + (scaledScore - 800000) / 100000 * 0.15;
+            else
+                strainValue *= 0.90 + (scaledScore - 900000) / 100000 * 0.1;
+
+            return strainValue;
+        }
+
+        private double computeAccuracyValue(double strainValue)
+        {
+            if (Attributes.GreatHitWindow <= 0)
+                return 0;
+
+            // Lots of arbitrary values from testing.
+            // Considering to use derivation from perfect accuracy in a probabilistic manner - assume normal distribution
+            double accuracyValue = Math.Max(0.0, 0.2 - (Attributes.GreatHitWindow - 34) * 0.006667)
+                                       * strainValue
+                                       * Math.Pow(Math.Max(0.0, scaledScore - 960000) / 40000, 1.1);
+
+            // Bonus for many hitcircles - it's harder to keep good accuracy up for longer
+            // accuracyValue *= Math.Min(1.15, Math.Pow(totalHits / 1500.0, 0.3));
+
+            return accuracyValue;
+        }
+
+        private double totalHits => countPerfect + countOk + countGreat + countGood + countMeh + countMiss;
+    }
+}
@@ -0,0 +1,13 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Mania.Judgements
+{
+    public class HoldNoteJudgement : ManiaJudgement
+    {
+        public override bool AffectsCombo => false;
+        protected override int NumericResultFor(HitResult result) => 0;
+    }
+}
@@ -15,7 +15,14 @@ using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Replays;
 using osu.Game.Rulesets.Replays.Types;
 using osu.Game.Beatmaps.Legacy;
+using osu.Game.Configuration;
+using osu.Game.Overlays.Settings;
+using osu.Game.Rulesets.Configuration;
+using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.Configuration;
+using osu.Game.Rulesets.Mania.Difficulty;
+using osu.Game.Rulesets.Scoring;

 namespace osu.Game.Rulesets.Mania
 {
@@ -23,6 +30,7 @@ namespace osu.Game.Rulesets.Mania
    {
        public override RulesetContainer CreateRulesetContainerWith(WorkingBeatmap beatmap) => new ManiaRulesetContainer(this, beatmap);
        public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new ManiaBeatmapConverter(beatmap);
+        public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, Score score) => new ManiaPerformanceCalculator(this, beatmap, score);

        public override IEnumerable<Mod> ConvertLegacyMods(LegacyMods mods)
        {
@@ -101,78 +109,34 @@ namespace osu.Game.Rulesets.Mania
                    {
                        new ManiaModEasy(),
                        new ManiaModNoFail(),
-                        new MultiMod
-                        {
-                            Mods = new Mod[]
-                            {
-                                new ManiaModHalfTime(),
-                                new ManiaModDaycore(),
-                            },
-                        },
+                        new MultiMod(new ManiaModHalfTime(), new ManiaModDaycore()),
                    };
-
                case ModType.DifficultyIncrease:
                    return new Mod[]
                    {
                        new ManiaModHardRock(),
-                        new MultiMod
-                        {
-                            Mods = new Mod[]
-                            {
-                                new ManiaModSuddenDeath(),
-                                new ManiaModPerfect(),
-                            },
-                        },
-                        new MultiMod
-                        {
-                            Mods = new Mod[]
-                            {
-                                new ManiaModDoubleTime(),
-                                new ManiaModNightcore(),
-                            },
-                        },
-                        new MultiMod
-                        {
-                            Mods = new Mod[]
-                            {
-                                new ManiaModFadeIn(),
-                                new ManiaModHidden(),
-                            }
-                        },
+                        new MultiMod(new ManiaModSuddenDeath(), new ManiaModPerfect()),
+                        new MultiMod(new ManiaModDoubleTime(), new ManiaModNightcore()),
+                        new MultiMod(new ManiaModFadeIn(), new ManiaModHidden()),
                        new ManiaModFlashlight(),
                    };
-
                case ModType.Special:
                    return new Mod[]
                    {
-                        new MultiMod
-                        {
-                            Mods = new Mod[]
-                            {
-                                new ManiaModKey4(),
-                                new ManiaModKey5(),
-                                new ManiaModKey6(),
-                                new ManiaModKey7(),
-                                new ManiaModKey8(),
-                                new ManiaModKey9(),
-                                new ManiaModKey1(),
-                                new ManiaModKey2(),
-                                new ManiaModKey3(),
-                            },
-                        },
+                        new MultiMod(new ManiaModKey4(),
+                            new ManiaModKey5(),
+                            new ManiaModKey6(),
+                            new ManiaModKey7(),
+                            new ManiaModKey8(),
+                            new ManiaModKey9(),
+                            new ManiaModKey1(),
+                            new ManiaModKey2(),
+                            new ManiaModKey3()),
                        new ManiaModRandom(),
                        new ManiaModDualStages(),
                        new ManiaModMirror(),
-                        new MultiMod
-                        {
-                            Mods = new Mod[]
-                            {
-                                new ManiaModAutoplay(),
-                                new ModCinema(),
-                            },
-                        },
+                        new MultiMod(new ManiaModAutoplay(), new ModCinema()),
                    };
-
                default:
                    return new Mod[] { };
            }
@@ -184,12 +148,16 @@ namespace osu.Game.Rulesets.Mania

        public override Drawable CreateIcon() => new SpriteIcon { Icon = FontAwesome.fa_osu_mania_o };

-        public override DifficultyCalculator CreateDifficultyCalculator(IBeatmap beatmap, Mod[] mods = null) => new ManiaDifficultyCalculator(beatmap, mods);
+        public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new ManiaDifficultyCalculator(this, beatmap);

        public override int? LegacyID => 3;

        public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new ManiaReplayFrame();

+        public override IRulesetConfigManager CreateConfig(SettingsStore settings) => new ManiaConfigManager(settings, RulesetInfo);
+
+        public override RulesetSettingsSubsection CreateSettings() => new ManiaSettingsSubsection(this);
+
        public ManiaRuleset(RulesetInfo rulesetInfo = null)
            : base(rulesetInfo)
        {
@@ -0,0 +1,34 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Overlays.Settings;
+using osu.Game.Rulesets.Mania.Configuration;
+using osu.Game.Rulesets.Mania.UI;
+
+namespace osu.Game.Rulesets.Mania
+{
+    public class ManiaSettingsSubsection : RulesetSettingsSubsection
+    {
+        protected override string Header => "osu!mania";
+
+        public ManiaSettingsSubsection(ManiaRuleset ruleset)
+            : base(ruleset)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(ManiaConfigManager config)
+        {
+            Children = new Drawable[]
+            {
+                new SettingsEnumDropdown<ManiaScrollingDirection>
+                {
+                    LabelText = "Scrolling direction",
+                    Bindable = config.GetBindable<ManiaScrollingDirection>(ManiaSetting.ScrollDirection)
+                }
+            };
+        }
+    }
+}
@@ -1,6 +1,8 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

+using System;
+using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mods;
@@ -24,5 +26,18 @@ namespace osu.Game.Rulesets.Mania.Mods

            mbc.TargetColumns = KeyCount;
        }
+
+        public override Type[] IncompatibleMods => new[]
+        {
+            typeof(ManiaModKey1),
+            typeof(ManiaModKey2),
+            typeof(ManiaModKey3),
+            typeof(ManiaModKey4),
+            typeof(ManiaModKey5),
+            typeof(ManiaModKey6),
+            typeof(ManiaModKey7),
+            typeof(ManiaModKey8),
+            typeof(ManiaModKey9),
+        }.Except(new[] { GetType() }).ToArray();
    }
 }
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Mania.Mods
        public override string Name => "Dual Stages";
        public override string ShortenedName => "DS";
        public override string Description => @"Double the stages, double the fun!";
-        public override double ScoreMultiplier => 0;
+        public override double ScoreMultiplier => 1;

        private bool isForCurrentRuleset;

@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Mania.Mods
        public override string ShortenedName => "RD";
        public override FontAwesome Icon => FontAwesome.fa_osu_dice;
        public override string Description => @"Shuffle around the keys!";
-        public override double ScoreMultiplier => 0;
+        public override double ScoreMultiplier => 1;

        public void ApplyToRulesetContainer(RulesetContainer<ManiaHitObject> rulesetContainer)
        {
@@ -5,6 +5,7 @@ using OpenTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Objects.Drawables;
+using OpenTK.Graphics;

 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
@@ -28,7 +29,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
            : base(barLine)
        {
            RelativeSizeAxes = Axes.X;
-            Height = 1;
+            Height = 2f;

            AddInternal(new Box
            {
@@ -36,6 +37,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                Anchor = Anchor.BottomCentre,
                Origin = Anchor.BottomCentre,
                RelativeSizeAxes = Axes.Both,
+                Colour = new Color4(255, 204, 33, 255),
            });

            bool isMajor = barLine.BeatIndex % (int)barLine.ControlPoint.TimeSignature == 0;
@@ -2,7 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

 using System.Linq;
-using osu.Game.Rulesets.Objects.Drawables;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 using OpenTK.Graphics;
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Mania.Judgements;
 using osu.Framework.Input.Bindings;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.UI.Scrolling;

 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
@@ -18,12 +19,12 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
    /// </summary>
    public class DrawableHoldNote : DrawableManiaHitObject<HoldNote>, IKeyBindingHandler<ManiaAction>
    {
+        public override bool DisplayJudgement => false;
+
        private readonly DrawableNote head;
        private readonly DrawableNote tail;

-        private readonly GlowPiece glowPiece;
        private readonly BodyPiece bodyPiece;
-        private readonly Container fullHeightContainer;

        /// <summary>
        /// Time at which the user started holding this hold note. Null if the user is not holding this hold note.
@@ -35,25 +36,17 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
        /// </summary>
        private bool hasBroken;

+        private readonly Container<DrawableHoldNoteTick> tickContainer;
+
        public DrawableHoldNote(HoldNote hitObject, ManiaAction action)
            : base(hitObject, action)
        {
-            Container<DrawableHoldNoteTick> tickContainer;
            RelativeSizeAxes = Axes.X;

            InternalChildren = new Drawable[]
            {
-                // The hit object itself cannot be used for various elements because the tail overshoots it
-                // So a specialized container that is updated to contain the tail height is used
-                fullHeightContainer = new Container
-                {
-                    RelativeSizeAxes = Axes.X,
-                    Child = glowPiece = new GlowPiece()
-                },
                bodyPiece = new BodyPiece
                {
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
                    RelativeSizeAxes = Axes.X,
                },
                tickContainer = new Container<DrawableHoldNoteTick>
@@ -83,6 +76,13 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
            AddNested(tail);
        }

+        protected override void OnDirectionChanged(ScrollingDirection direction)
+        {
+            base.OnDirectionChanged(direction);
+
+            bodyPiece.Anchor = bodyPiece.Origin = direction == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
+        }
+
        public override Color4 AccentColour
        {
            get { return base.AccentColour; }
@@ -90,15 +90,17 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
            {
                base.AccentColour = value;

-                glowPiece.AccentColour = value;
                bodyPiece.AccentColour = value;
                head.AccentColour = value;
                tail.AccentColour = value;
+                tickContainer.ForEach(t => t.AccentColour = value);
            }
        }

-        protected override void UpdateState(ArmedState state)
+        protected override void CheckForJudgements(bool userTriggered, double timeOffset)
        {
+            if (tail.AllJudged)
+                AddJudgement(new HoldNoteJudgement { Result = HitResult.Perfect });
        }

        protected override void Update()
@@ -106,12 +108,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
            base.Update();

            // Make the body piece not lie under the head note
-            bodyPiece.Y = head.Height;
-            bodyPiece.Height = DrawHeight - head.Height;
-
-            // Make the fullHeightContainer "contain" the height of the tail note, keeping in mind
-            // that the tail note overshoots the height of this hit object
-            fullHeightContainer.Height = DrawHeight + tail.Height;
+            bodyPiece.Y = (Direction.Value == ScrollingDirection.Up ? 1 : -1) * head.Height / 2;
+            bodyPiece.Height = DrawHeight - head.Height / 2 + tail.Height / 2;
        }

        public bool OnPressed(ManiaAction action)
@@ -160,8 +158,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                : base(holdNote.HitObject.Head, action)
            {
                this.holdNote = holdNote;
-
-                GlowPiece.Alpha = 0;
            }

            public override bool OnPressed(ManiaAction action)
@@ -179,11 +175,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables

                return true;
            }
-
-            protected override void UpdateState(ArmedState state)
-            {
-                // The holdnote keeps scrolling through for now, so having the head disappear looks weird
-            }
        }

        /// <summary>
@@ -191,18 +182,26 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
        /// </summary>
        private class DrawableTailNote : DrawableNote
        {
+            /// <summary>
+            /// Lenience of release hit windows. This is to make cases where the hold note release
+            /// is timed alongside presses of other hit objects less awkward.
+            /// Todo: This shouldn't exist for non-LegacyBeatmapDecoder beatmaps
+            /// </summary>
+            private const double release_window_lenience = 1.5;
+
            private readonly DrawableHoldNote holdNote;

            public DrawableTailNote(DrawableHoldNote holdNote, ManiaAction action)
                : base(holdNote.HitObject.Tail, action)
            {
                this.holdNote = holdNote;
-
-                GlowPiece.Alpha = 0;
            }

            protected override void CheckForJudgements(bool userTriggered, double timeOffset)
            {
+                // Factor in the release lenience
+                timeOffset /= release_window_lenience;
+
                if (!userTriggered)
                {
                    if (!HitObject.HitWindows.CanBeHit(timeOffset))
@@ -228,11 +227,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                });
            }

-            protected override void UpdateState(ArmedState state)
-            {
-                // The holdnote keeps scrolling through, so having the tail disappear looks weird
-            }
-
            public override bool OnPressed(ManiaAction action) => false; // Tail doesn't handle key down

            public override bool OnReleased(ManiaAction action)
@@ -8,7 +8,6 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Mania.Judgements;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Scoring;

@@ -87,16 +86,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
            AddJudgement(new HoldNoteTickJudgement { Result = HitResult.Perfect });
        }

-        protected override void UpdateState(ArmedState state)
-        {
-            switch (State.Value)
-            {
-                case ArmedState.Hit:
-                    AccentColour = Color4.Green;
-                    break;
-            }
-        }
-
        protected override void Update()
        {
            if (AllJudged)
@@ -1,8 +1,12 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

+using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 using osu.Framework.Graphics;
+using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.UI.Scrolling;

 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
@@ -16,16 +20,40 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables

        public new TObject HitObject;

+        protected readonly IBindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
+
        protected DrawableManiaHitObject(TObject hitObject, ManiaAction? action = null)
            : base(hitObject)
        {
-            Anchor = Anchor.TopCentre;
-            Origin = Anchor.TopCentre;
-
            HitObject = hitObject;

            if (action != null)
                Action = action.Value;
        }
+
+        [BackgroundDependencyLoader]
+        private void load(IScrollingInfo scrollingInfo)
+        {
+            Direction.BindTo(scrollingInfo.Direction);
+            Direction.BindValueChanged(OnDirectionChanged, true);
+        }
+
+        protected virtual void OnDirectionChanged(ScrollingDirection direction)
+        {
+            Anchor = Origin = direction == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre;
+        }
+
+        protected override void UpdateState(ArmedState state)
+        {
+            switch (state)
+            {
+                case ArmedState.Miss:
+                    this.FadeOut(150, Easing.In).Expire();
+                    break;
+                case ArmedState.Hit:
+                    this.FadeOut(150, Easing.OutQuint).Expire();
+                    break;
+            }
+        }
    }
 }
@@ -1,13 +1,15 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

+using osu.Framework.Extensions.Color4Extensions;
 using OpenTK.Graphics;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
 using osu.Game.Rulesets.Mania.Judgements;
 using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.UI.Scrolling;

 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
@@ -16,9 +18,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
    /// </summary>
    public class DrawableNote : DrawableManiaHitObject<Note>, IKeyBindingHandler<ManiaAction>
    {
-        protected readonly GlowPiece GlowPiece;
-
-        private readonly LaneGlowPiece laneGlowPiece;
        private readonly NotePiece headPiece;

        public DrawableNote(Note hitObject, ManiaAction action)
@@ -27,20 +26,17 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
            RelativeSizeAxes = Axes.X;
            AutoSizeAxes = Axes.Y;

-            InternalChildren = new Drawable[]
-            {
-                laneGlowPiece = new LaneGlowPiece
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre
-                },
-                GlowPiece = new GlowPiece(),
-                headPiece = new NotePiece
-                {
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre
-                }
-            };
+            CornerRadius = 5;
+            Masking = true;
+
+            InternalChild = headPiece = new NotePiece();
+        }
+
+        protected override void OnDirectionChanged(ScrollingDirection direction)
+        {
+            base.OnDirectionChanged(direction);
+
+            headPiece.Anchor = headPiece.Origin = direction == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre;
        }

        public override Color4 AccentColour
@@ -49,9 +45,14 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
            set
            {
                base.AccentColour = value;
-                laneGlowPiece.AccentColour = AccentColour;
-                GlowPiece.AccentColour = AccentColour;
                headPiece.AccentColour = AccentColour;
+
+                EdgeEffect = new EdgeEffectParameters
+                {
+                    Type = EdgeEffectType.Glow,
+                    Colour = AccentColour.Lighten(1f).Opacity(0.6f),
+                    Radius = 10,
+                };
            }
        }

@@ -71,17 +72,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
            AddJudgement(new ManiaJudgement { Result = result });
        }

-        protected override void UpdateState(ArmedState state)
-        {
-            switch (state)
-            {
-                case ArmedState.Hit:
-                case ArmedState.Miss:
-                    this.FadeOut(100).Expire();
-                    break;
-            }
-        }
-
        public virtual bool OnPressed(ManiaAction action)
        {
            if (action != Action)
@@ -123,8 +123,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
            if (!IsLoaded)
                return;

-            foreground.Colour = AccentColour.Opacity(0.4f);
-            background.Colour = AccentColour.Opacity(0.2f);
+            foreground.Colour = AccentColour.Opacity(0.9f);
+            background.Colour = AccentColour.Opacity(0.6f);

            subtractionCache.Invalidate();
        }
@@ -1,12 +1,16 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

+using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 using OpenTK.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
 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;

 namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
 {
@@ -15,15 +19,17 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
    /// </summary>
    internal class NotePiece : Container, IHasAccentColour
    {
-        private const float head_height = 10;
+        public const float NOTE_HEIGHT = 10;
        private const float head_colour_height = 6;

+        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+
        private readonly Box colouredBox;

        public NotePiece()
        {
            RelativeSizeAxes = Axes.X;
-            Height = head_height;
+            Height = NOTE_HEIGHT;

            Children = new[]
            {
@@ -33,8 +39,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
                },
                colouredBox = new Box
                {
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
                    RelativeSizeAxes = Axes.X,
                    Height = head_colour_height,
                    Alpha = 0.2f
@@ -42,6 +46,16 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
            };
        }

+        [BackgroundDependencyLoader]
+        private void load(IScrollingInfo scrollingInfo)
+        {
+            direction.BindTo(scrollingInfo.Direction);
+            direction.BindValueChanged(direction =>
+            {
+                colouredBox.Anchor = colouredBox.Origin = direction == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre;
+            }, true);
+        }
+
        private Color4 accentColour;
        public Color4 AccentColour
        {
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Mania.Objects
        /// <summary>
        /// The tail note of the hold.
        /// </summary>
-        public readonly Note Tail = new TailNote();
+        public readonly Note Tail = new Note();

        /// <summary>
        /// The time between ticks of this hold.
@@ -94,24 +94,5 @@ namespace osu.Game.Rulesets.Mania.Objects
                });
            }
        }
-
-        /// <summary>
-        /// The tail of the hold note.
-        /// </summary>
-        private class TailNote : Note
-        {
-            /// <summary>
-            /// Lenience of release hit windows. This is to make cases where the hold note release
-            /// is timed alongside presses of other hit objects less awkward.
-            /// </summary>
-            private const double release_window_lenience = 1.5;
-
-            protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
-            {
-                base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
-
-                HitWindows *= release_window_lenience;
-            }
-        }
    }
 }
@@ -1,8 +1,6 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Mania.Objects.Types;
 using osu.Game.Rulesets.Objects;

@@ -12,12 +10,6 @@ namespace osu.Game.Rulesets.Mania.Objects
    {
        public virtual int Column { get; set; }

-        protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
-        {
-            base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
-
-            HitWindows.AllowsPerfect = true;
-            HitWindows.AllowsOk = true;
-        }
+        protected override HitWindows CreateHitWindows() => new ManiaHitWindows();
    }
 }
@@ -0,0 +1,36 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Collections.Generic;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Mania.Objects
+{
+    public class ManiaHitWindows : HitWindows
+    {
+        private static readonly IReadOnlyDictionary<HitResult, (double od0, double od5, double od10)> base_ranges = new Dictionary<HitResult, (double, double, double)>
+        {
+            { HitResult.Perfect, (44.8, 38.8, 27.8) },
+            { HitResult.Great, (128, 98, 68 ) },
+            { HitResult.Good, (194, 164, 134) },
+            { HitResult.Ok, (254, 224, 194) },
+            { HitResult.Meh, (302, 272, 242) },
+            { HitResult.Miss, (376, 346, 316) },
+        };
+
+        public override void SetDifficulty(double difficulty)
+        {
+            AllowsPerfect = true;
+            AllowsOk = true;
+
+            Perfect = BeatmapDifficulty.DifficultyRange(difficulty, base_ranges[HitResult.Perfect]);
+            Great = BeatmapDifficulty.DifficultyRange(difficulty, base_ranges[HitResult.Great]);
+            Good = BeatmapDifficulty.DifficultyRange(difficulty, base_ranges[HitResult.Good]);
+            Ok = BeatmapDifficulty.DifficultyRange(difficulty, base_ranges[HitResult.Ok]);
+            Meh = BeatmapDifficulty.DifficultyRange(difficulty, base_ranges[HitResult.Meh]);
+            Miss = BeatmapDifficulty.DifficultyRange(difficulty, base_ranges[HitResult.Miss]);
+        }
+    }
+}
@@ -17,6 +17,6 @@ namespace osu.Game.Rulesets.Mania.Replays

        protected override bool IsImportant(ManiaReplayFrame frame) => frame.Actions.Any();

-        public override List<InputState> GetPendingStates() => new List<InputState> { new ReplayState<ManiaAction> { PressedActions = CurrentFrame.Actions } };
+        public override List<IInput> GetPendingInputs() => new List<IInput> { new ReplayState<ManiaAction> { PressedActions = CurrentFrame.Actions } };
    }
 }
@@ -1,111 +1,73 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

-using OpenTK;
 using OpenTK.Graphics;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.Colour;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
-using System;
 using System.Linq;
 using osu.Framework.Input.Bindings;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mania.UI.Components;
 using osu.Game.Rulesets.UI.Scrolling;

 namespace osu.Game.Rulesets.Mania.UI
 {
-    public class Column : ScrollingPlayfield, IKeyBindingHandler<ManiaAction>, IHasAccentColour
+    public class Column : ManiaScrollingPlayfield, IKeyBindingHandler<ManiaAction>, IHasAccentColour
    {
-        private const float key_icon_size = 10;
-        private const float key_icon_corner_radius = 3;
-        private const float key_icon_border_radius = 2;
-
-        private const float hit_target_height = 10;
-        private const float hit_target_bar_height = 2;
-
        private const float column_width = 45;
        private const float special_column_width = 70;

-        public ManiaAction Action;
+        private ManiaAction action;

-        private readonly Box background;
-        private readonly Container hitTargetBar;
-        private readonly Container keyIcon;
+        public ManiaAction Action
+        {
+            get => action;
+            set
+            {
+                if (action == value)
+                    return;
+                action = value;
+
+                background.Action = value;
+                keyArea.Action = value;
+            }
+        }
+
+        private readonly ColumnBackground background;
+        private readonly ColumnKeyArea keyArea;
+        private readonly ColumnHitObjectArea hitObjectArea;

        internal readonly Container TopLevelContainer;
        private readonly Container explosionContainer;

-        protected override Container<Drawable> Content => content;
-        private readonly Container<Drawable> content;
+        protected override Container<Drawable> Content => hitObjectArea;

-        private const float opacity_released = 0.1f;
-        private const float opacity_pressed = 0.25f;
-
-        public Column()
-            : base(ScrollingDirection.Up)
+        public Column(ScrollingDirection direction)
+            : base(direction)
        {
            RelativeSizeAxes = Axes.Y;
            Width = column_width;

-            InternalChildren = new Drawable[]
+            Masking = true;
+            CornerRadius = 5;
+
+            background = new ColumnBackground { RelativeSizeAxes = Axes.Both };
+
+            Container hitTargetContainer;
+
+            InternalChildren = new[]
            {
-                background = new Box
-                {
-                    Name = "Background",
-                    RelativeSizeAxes = Axes.Both,
-                    Alpha = opacity_released
-                },
-                new Container
+                // For input purposes, the background is added at the highest depth, but is then proxied back below all other elements
+                background.CreateProxy(),
+                hitTargetContainer = new Container
                {
                    Name = "Hit target + hit objects",
                    RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Top = ManiaStage.HIT_TARGET_POSITION },
                    Children = new Drawable[]
                    {
-                        new Container
-                        {
-                            Name = "Hit target",
-                            RelativeSizeAxes = Axes.X,
-                            Height = hit_target_height,
-                            Children = new Drawable[]
-                            {
-                                new Box
-                                {
-                                    Name = "Background",
-                                    RelativeSizeAxes = Axes.Both,
-                                    Colour = Color4.Black
-                                },
-                                hitTargetBar = new Container
-                                {
-                                    Name = "Bar",
-                                    RelativeSizeAxes = Axes.X,
-                                    Height = hit_target_bar_height,
-                                    Masking = true,
-                                    Children = new[]
-                                    {
-                                        new Box
-                                        {
-                                            RelativeSizeAxes = Axes.Both
-                                        }
-                                    }
-                                }
-                            }
-                        },
-                        content = new Container
-                        {
-                            Name = "Hit objects",
-                            RelativeSizeAxes = Axes.Both,
-                        },
-                        // For column lighting, we need to capture input events before the notes
-                        new InputTarget
-                        {
-                            Pressed = onPressed,
-                            Released = onReleased
-                        },
+                        hitObjectArea = new ColumnHitObjectArea { RelativeSizeAxes = Axes.Both },
                        explosionContainer = new Container
                        {
                            Name = "Hit explosions",
@@ -113,46 +75,27 @@ namespace osu.Game.Rulesets.Mania.UI
                        }
                    }
                },
-                new Container
+                keyArea = new ColumnKeyArea
                {
-                    Name = "Key",
                    RelativeSizeAxes = Axes.X,
                    Height = ManiaStage.HIT_TARGET_POSITION,
-                    Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            Name = "Key gradient",
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = ColourInfo.GradientVertical(Color4.Black, Color4.Black.Opacity(0)),
-                            Alpha = 0.5f
-                        },
-                        keyIcon = new Container
-                        {
-                            Name = "Key icon",
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Size = new Vector2(key_icon_size),
-                            Masking = true,
-                            CornerRadius = key_icon_corner_radius,
-                            BorderThickness = 2,
-                            BorderColour = Color4.White, // Not true
-                            Children = new[]
-                            {
-                                new Box
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Alpha = 0,
-                                    AlwaysPresent = true
-                                }
-                            }
-                        }
-                    }
                },
+                background,
                TopLevelContainer = new Container { RelativeSizeAxes = Axes.Both }
            };

            TopLevelContainer.Add(explosionContainer.CreateProxy());
+
+            Direction.BindValueChanged(d =>
+            {
+                hitTargetContainer.Padding = new MarginPadding
+                {
+                    Top = d == ScrollingDirection.Up ? ManiaStage.HIT_TARGET_POSITION : 0,
+                    Bottom = d == ScrollingDirection.Down ? ManiaStage.HIT_TARGET_POSITION : 0,
+                };
+
+                keyArea.Anchor = keyArea.Origin= d == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
+            }, true);
        }

        public override Axes RelativeSizeAxes => Axes.Y;
@@ -181,21 +124,9 @@ namespace osu.Game.Rulesets.Mania.UI
                    return;
                accentColour = value;

-                background.Colour = accentColour;
-
-                hitTargetBar.EdgeEffect = new EdgeEffectParameters
-                {
-                    Type = EdgeEffectType.Glow,
-                    Radius = 5,
-                    Colour = accentColour.Opacity(0.5f),
-                };
-
-                keyIcon.EdgeEffect = new EdgeEffectParameters
-                {
-                    Type = EdgeEffectType.Glow,
-                    Radius = 5,
-                    Colour = accentColour.Opacity(0.5f),
-                };
+                background.AccentColour = value;
+                keyArea.AccentColour = value;
+                hitObjectArea.AccentColour = value;
            }
        }

@@ -213,51 +144,13 @@ namespace osu.Game.Rulesets.Mania.UI

        internal void OnJudgement(DrawableHitObject judgedObject, Judgement judgement)
        {
-            if (!judgement.IsHit)
+            if (!judgement.IsHit || !judgedObject.DisplayJudgement)
                return;

-            explosionContainer.Add(new HitExplosion(judgedObject));
-        }
-
-        private bool onPressed(ManiaAction action)
-        {
-            if (action == Action)
+            explosionContainer.Add(new HitExplosion(judgedObject)
            {
-                background.FadeTo(opacity_pressed, 50, Easing.OutQuint);
-                keyIcon.ScaleTo(1.4f, 50, Easing.OutQuint);
-            }
-
-            return false;
-        }
-
-        private bool onReleased(ManiaAction action)
-        {
-            if (action == Action)
-            {
-                background.FadeTo(opacity_released, 800, Easing.OutQuart);
-                keyIcon.ScaleTo(1f, 400, Easing.OutQuart);
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// This is a simple container which delegates various input events that have to be captured before the notes.
-        /// </summary>
-        private class InputTarget : Container, IKeyBindingHandler<ManiaAction>
-        {
-            public Func<ManiaAction, bool> Pressed;
-            public Func<ManiaAction, bool> Released;
-
-            public InputTarget()
-            {
-                RelativeSizeAxes = Axes.Both;
-                AlwaysPresent = true;
-                Alpha = 0;
-            }
-
-            public bool OnPressed(ManiaAction action) => Pressed?.Invoke(action) ?? false;
-            public bool OnReleased(ManiaAction action) => Released?.Invoke(action) ?? false;
+                Anchor = Direction == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre
+            });
        }

        public bool OnPressed(ManiaAction action)
@@ -265,8 +158,13 @@ namespace osu.Game.Rulesets.Mania.UI
            if (action != Action)
                return false;

-            var hitObject = HitObjects.Objects.LastOrDefault(h => h.HitObject.StartTime > Time.Current) ?? HitObjects.Objects.FirstOrDefault();
-            hitObject?.PlaySamples();
+            var nextObject =
+                HitObjects.AliveObjects.FirstOrDefault(h => h.HitObject.StartTime > Time.Current) ??
+                // fallback to non-alive objects to find next off-screen object
+                HitObjects.Objects.FirstOrDefault(h => h.HitObject.StartTime > Time.Current) ??
+                HitObjects.Objects.LastOrDefault();
+
+            nextObject?.PlaySamples();

            return true;
        }
@@ -0,0 +1,106 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Configuration;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input.Bindings;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.UI.Scrolling;
+using OpenTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.UI.Components
+{
+    public class ColumnBackground : CompositeDrawable, IKeyBindingHandler<ManiaAction>, IHasAccentColour
+    {
+        public ManiaAction Action;
+
+        private Box background;
+        private Box backgroundOverlay;
+
+        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+
+        [BackgroundDependencyLoader]
+        private void load(IScrollingInfo scrollingInfo)
+        {
+            InternalChildren = new[]
+            {
+                background = new Box
+                {
+                    Name = "Background",
+                    RelativeSizeAxes = Axes.Both,
+                    Alpha = 0.3f
+                },
+                backgroundOverlay = new Box
+                {
+                    Name = "Background Gradient Overlay",
+                    RelativeSizeAxes = Axes.Both,
+                    Height = 0.5f,
+                    Blending = BlendingMode.Additive,
+                    Alpha = 0
+                }
+            };
+
+            direction.BindTo(scrollingInfo.Direction);
+            direction.BindValueChanged(direction =>
+            {
+                backgroundOverlay.Anchor = backgroundOverlay.Origin = direction == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
+                updateColours();
+            }, true);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            updateColours();
+        }
+
+        private Color4 accentColour;
+
+        public Color4 AccentColour
+        {
+            get => accentColour;
+            set
+            {
+                if (accentColour == value)
+                    return;
+                accentColour = value;
+
+                updateColours();
+            }
+        }
+
+        private void updateColours()
+        {
+            if (!IsLoaded)
+                return;
+
+            background.Colour = AccentColour;
+
+            var brightPoint = AccentColour.Opacity(0.6f);
+            var dimPoint = AccentColour.Opacity(0);
+
+            backgroundOverlay.Colour = ColourInfo.GradientVertical(
+                direction.Value == ScrollingDirection.Up ? brightPoint : dimPoint,
+                direction.Value == ScrollingDirection.Up ? dimPoint : brightPoint);
+        }
+
+        public bool OnPressed(ManiaAction action)
+        {
+            if (action == Action)
+                backgroundOverlay.FadeTo(1, 50, Easing.OutQuint).Then().FadeTo(0.5f, 250, Easing.OutQuint);
+            return false;
+        }
+
+        public bool OnReleased(ManiaAction action)
+        {
+            if (action == Action)
+                backgroundOverlay.FadeTo(0, 250, Easing.OutQuint);
+            return false;
+        }
+    }
+}
@@ -0,0 +1,99 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Configuration;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.UI.Scrolling;
+using OpenTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.UI.Components
+{
+    public class ColumnHitObjectArea : Container, IHasAccentColour
+    {
+        private const float hit_target_height = 10;
+        private const float hit_target_bar_height = 2;
+
+        private Container<Drawable> content;
+        protected override Container<Drawable> Content => content;
+
+        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+
+        private Container hitTargetLine;
+
+        [BackgroundDependencyLoader]
+        private void load(IScrollingInfo scrollingInfo)
+        {
+            Drawable hitTargetBar;
+
+            InternalChildren = new[]
+            {
+                hitTargetBar = new Box
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Height = hit_target_height,
+                    Colour = Color4.Black
+                },
+                hitTargetLine = new Container
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Height = hit_target_bar_height,
+                    Masking = true,
+                    Child = new Box { RelativeSizeAxes = Axes.Both }
+                },
+                content = new Container
+                {
+                    Name = "Hit objects",
+                    RelativeSizeAxes = Axes.Both,
+                },
+            };
+
+            direction.BindTo(scrollingInfo.Direction);
+            direction.BindValueChanged(direction =>
+            {
+                Anchor anchor = direction == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
+
+                hitTargetBar.Anchor = hitTargetBar.Origin = anchor;
+                hitTargetLine.Anchor = hitTargetLine.Origin = anchor;
+            }, true);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            updateColours();
+        }
+
+        private Color4 accentColour;
+
+        public Color4 AccentColour
+        {
+            get => accentColour;
+            set
+            {
+                if (accentColour == value)
+                    return;
+                accentColour = value;
+
+                updateColours();
+            }
+        }
+
+        private void updateColours()
+        {
+            if (!IsLoaded)
+                return;
+
+            hitTargetLine.EdgeEffect = new EdgeEffectParameters
+            {
+                Type = EdgeEffectType.Glow,
+                Radius = 5,
+                Colour = accentColour.Opacity(0.5f),
+            };
+        }
+    }
+}
@@ -0,0 +1,122 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Configuration;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input.Bindings;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.UI.Scrolling;
+using OpenTK;
+using OpenTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.UI.Components
+{
+    public class ColumnKeyArea : CompositeDrawable, IKeyBindingHandler<ManiaAction>, IHasAccentColour
+    {
+        private const float key_icon_size = 10;
+        private const float key_icon_corner_radius = 3;
+
+        public ManiaAction Action;
+
+        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+
+        private Container keyIcon;
+
+        [BackgroundDependencyLoader]
+        private void load(IScrollingInfo scrollingInfo)
+        {
+            Drawable gradient;
+
+            InternalChildren = new[]
+            {
+                gradient = new Box
+                {
+                    Name = "Key gradient",
+                    RelativeSizeAxes = Axes.Both,
+                    Alpha = 0.5f
+                },
+                keyIcon = new Container
+                {
+                    Name = "Key icon",
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(key_icon_size),
+                    Masking = true,
+                    CornerRadius = key_icon_corner_radius,
+                    BorderThickness = 2,
+                    BorderColour = Color4.White, // Not true
+                    Children = new[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Alpha = 0,
+                            AlwaysPresent = true
+                        }
+                    }
+                }
+            };
+
+            direction.BindTo(scrollingInfo.Direction);
+            direction.BindValueChanged(direction =>
+            {
+                gradient.Colour = ColourInfo.GradientVertical(
+                    direction == ScrollingDirection.Up ? Color4.Black : Color4.Black.Opacity(0),
+                    direction == ScrollingDirection.Up ? Color4.Black.Opacity(0) : Color4.Black);
+            }, true);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            updateColours();
+        }
+
+        private Color4 accentColour;
+
+        public Color4 AccentColour
+        {
+            get => accentColour;
+            set
+            {
+                if (accentColour == value)
+                    return;
+                accentColour = value;
+
+                updateColours();
+            }
+        }
+
+        private void updateColours()
+        {
+            if (!IsLoaded)
+                return;
+
+            keyIcon.EdgeEffect = new EdgeEffectParameters
+            {
+                Type = EdgeEffectType.Glow,
+                Radius = 5,
+                Colour = accentColour.Opacity(0.5f),
+            };
+        }
+
+        public bool OnPressed(ManiaAction action)
+        {
+            if (action == Action)
+                keyIcon.ScaleTo(1.4f, 50, Easing.OutQuint).Then().ScaleTo(1.3f, 250, Easing.OutQuint);
+            return false;
+        }
+
+        public bool OnReleased(ManiaAction action)
+        {
+            if (action == Action)
+                keyIcon.ScaleTo(1f, 125, Easing.OutQuint);
+            return false;
+        }
+    }
+}
@@ -1,54 +1,56 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

-using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.MathUtils;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Objects.Drawables;
+using OpenTK;

 namespace osu.Game.Rulesets.Mania.UI
 {
    internal class HitExplosion : CompositeDrawable
    {
-        private readonly Box inner;
+        public override bool RemoveWhenNotAlive => true;
+
+        private readonly CircularContainer circle;

        public HitExplosion(DrawableHitObject judgedObject)
        {
            bool isTick = judgedObject is DrawableHoldNoteTick;

-            Anchor = Anchor.TopCentre;
            Origin = Anchor.Centre;

-            RelativeSizeAxes = Axes.Both;
-            Size = new Vector2(isTick ? 0.5f : 1);
-            FillMode = FillMode.Fit;
+            RelativeSizeAxes = Axes.X;
+            Y = NotePiece.NOTE_HEIGHT / 2;
+            Height = NotePiece.NOTE_HEIGHT;

-            Blending = BlendingMode.Additive;
+            // scale roughly in-line with visual appearance of notes
+            Scale = new Vector2(isTick ? 0.4f : 0.8f);

-            Color4 accent = isTick ? Color4.White : judgedObject.AccentColour;
-
-            InternalChild = new CircularContainer
+            InternalChild = circle = new CircularContainer
            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
                RelativeSizeAxes = Axes.Both,
                Masking = true,
-                BorderThickness = 1,
-                BorderColour = accent,
+                // we want our size to be very small so the glow dominates it.
+                Size = new Vector2(0.1f),
                EdgeEffect = new EdgeEffectParameters
                {
                    Type = EdgeEffectType.Glow,
-                    Colour = accent,
-                    Radius = 10,
-                    Hollow = true
+                    Colour = Interpolation.ValueAt(0.1f, judgedObject.AccentColour, Color4.White, 0, 1),
+                    Radius = 100,
                },
-                Child = inner = new Box
+                Child = new Box
                {
+                    Alpha = 0,
                    RelativeSizeAxes = Axes.Both,
-                    Colour = accent,
-                    Alpha = 1,
-                    AlwaysPresent = true,
+                    AlwaysPresent = true
                }
            };
        }
@@ -57,8 +59,8 @@ namespace osu.Game.Rulesets.Mania.UI
        {
            base.LoadComplete();

-            this.ScaleTo(2f, 600, Easing.OutQuint).FadeOut(500);
-            inner.FadeOut(250);
+            circle.ResizeTo(circle.Size * new Vector2(4, 20), 1000, Easing.OutQuint);
+            this.FadeIn(16).Then().FadeOut(500, Easing.OutQuint);

            Expire(true);
        }
@@ -0,0 +1,17 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Configuration;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.UI.Scrolling;
+
+namespace osu.Game.Rulesets.Mania.UI
+{
+    public interface IScrollingInfo
+    {
+        /// <summary>
+        /// The direction <see cref="HitObject"/>s should scroll in.
+        /// </summary>
+        IBindable<ScrollingDirection> Direction { get; }
+    }
+}
@@ -8,7 +8,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Configuration;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -17,18 +16,13 @@ using osu.Game.Rulesets.UI.Scrolling;

 namespace osu.Game.Rulesets.Mania.UI
 {
-    public class ManiaPlayfield : ScrollingPlayfield
+    public class ManiaPlayfield : ManiaScrollingPlayfield
    {
-        /// <summary>
-        /// Whether this playfield should be inverted. This flips everything inside the playfield.
-        /// </summary>
-        public readonly Bindable<bool> Inverted = new Bindable<bool>(true);
-
        public List<Column> Columns => stages.SelectMany(x => x.Columns).ToList();
        private readonly List<ManiaStage> stages = new List<ManiaStage>();

-        public ManiaPlayfield(List<StageDefinition> stageDefinitions)
-            : base(ScrollingDirection.Up)
+        public ManiaPlayfield(ScrollingDirection direction, List<StageDefinition> stageDefinitions)
+            : base(direction)
        {
            if (stageDefinitions == null)
                throw new ArgumentNullException(nameof(stageDefinitions));
@@ -36,8 +30,6 @@ namespace osu.Game.Rulesets.Mania.UI
            if (stageDefinitions.Count <= 0)
                throw new ArgumentException("Can't have zero or fewer stages.");

-            Inverted.Value = true;
-
            GridContainer playfieldGrid;
            InternalChild = playfieldGrid = new GridContainer
            {
@@ -50,9 +42,8 @@ namespace osu.Game.Rulesets.Mania.UI
            int firstColumnIndex = 0;
            for (int i = 0; i < stageDefinitions.Count; i++)
            {
-                var newStage = new ManiaStage(firstColumnIndex, stageDefinitions[i], ref normalColumnAction, ref specialColumnAction);
+                var newStage = new ManiaStage(direction, firstColumnIndex, stageDefinitions[i], ref normalColumnAction, ref specialColumnAction);
                newStage.VisibleTimeRange.BindTo(VisibleTimeRange);
-                newStage.Inverted.BindTo(Inverted);

                playfieldGrid.Content[0][i] = newStage;

@@ -4,18 +4,17 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.MathUtils;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Configuration;
 using osu.Game.Input.Handlers;
-using osu.Game.Rulesets.Configuration;
 using osu.Game.Rulesets.Mania.Beatmaps;
-using osu.Game.Rulesets.Mania.Mods;
 using osu.Game.Rulesets.Mania.Configuration;
+using osu.Game.Rulesets.Mania.Mods;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.Replays;
@@ -36,6 +35,9 @@ namespace osu.Game.Rulesets.Mania.UI

        public IEnumerable<BarLine> BarLines;

+        private readonly Bindable<ManiaScrollingDirection> configDirection = new Bindable<ManiaScrollingDirection>();
+        private ScrollingInfo scrollingInfo;
+
        public ManiaRulesetContainer(Ruleset ruleset, WorkingBeatmap beatmap)
            : base(ruleset, beatmap)
        {
@@ -68,12 +70,24 @@ namespace osu.Game.Rulesets.Mania.UI
        }

        [BackgroundDependencyLoader]
-        private void load()
+        private void load(ManiaConfigManager config)
        {
            BarLines.ForEach(Playfield.Add);
+
+            config.BindWith(ManiaSetting.ScrollDirection, configDirection);
+            configDirection.BindValueChanged(d => scrollingInfo.Direction.Value = (ScrollingDirection)d, true);
        }

-        protected sealed override Playfield CreatePlayfield() => new ManiaPlayfield(Beatmap.Stages)
+        private DependencyContainer dependencies;
+
+        protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent)
+        {
+            dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
+            dependencies.CacheAs<IScrollingInfo>(scrollingInfo = new ScrollingInfo());
+            return dependencies;
+        }
+
+        protected sealed override Playfield CreatePlayfield() => new ManiaPlayfield(scrollingInfo.Direction, Beatmap.Stages)
        {
            Anchor = Anchor.Centre,
            Origin = Anchor.Centre,
@@ -104,6 +118,10 @@ namespace osu.Game.Rulesets.Mania.UI

        protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new ManiaFramedReplayInputHandler(replay);

-        protected override IRulesetConfigManager CreateConfig(Ruleset ruleset, SettingsStore settings) => new ManiaConfigManager(settings, Ruleset.RulesetInfo, Variant);
+        private class ScrollingInfo : IScrollingInfo
+        {
+            public readonly Bindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
+            IBindable<ScrollingDirection> IScrollingInfo.Direction => Direction;
+        }
    }
 }
--- a/Show More
+++ b/Show More