Merge pull request #616 from peppy/has-bindable-value

Update SliderBar to use IHasCurrentValue.

.vscode/launch.json

@@ -11,7 +11,7 @@
             "preLaunchTask": "build",
             "runtimeExecutable": null,
             "env": {},
-            "externalConsole": false
+            "console": "internalConsole"
         },
         {
             "name": "Launch Desktop",
@@ -23,7 +23,7 @@
             "preLaunchTask": "build",
             "runtimeExecutable": null,
             "env": {},
-            "externalConsole": false
+            "console": "internalConsole"
         },
         {
             "name": "Attach",

.vscode/tasks.json

@@ -2,25 +2,23 @@
     // See https://go.microsoft.com/fwlink/?LinkId=733558
     // for the documentation about the tasks.json format
     "version": "0.1.0",
-    "windows": {
-        "command": "msbuild"
-    },
-    "linux": {
-        "command": "xbuild"
-    },
-    "args": [
-        // Ask msbuild to generate full paths for file names.
-        "/property:GenerateFullPaths=true"
-    ],
     "taskSelector": "/t:",
-    "showOutput": "silent",
     "tasks": [
         {
             "taskName": "build",
-            // Show the output window only if unrecognized errors occur.
+            "isShellCommand": true,
             "showOutput": "silent",
+            "command": "xbuild",
+            "windows": {
+                "command": "msbuild"
+            },
+            "args": [
+                // Ask msbuild to generate full paths for file names.
+                "/property:GenerateFullPaths=true"
+            ],
             // Use the standard MS compiler pattern to detect errors, warnings and infos
-            "problemMatcher": "$msCompile"
+            "problemMatcher": "$msCompile",
+            "isBuildCommand": true
         }
     ]
 }

appveyor.yml

@@ -10,7 +10,7 @@ install:
   - cmd: git submodule update --init --recursive
   - cmd: choco install resharper-clt -y
   - cmd: choco install nvika -y
-  - cmd: appveyor DownloadFile https://github.com/peppy/CodeFileSanity/releases/download/v0.1/CodeFileSanity.exe
+  - cmd: appveyor DownloadFile https://github.com/peppy/CodeFileSanity/releases/download/v0.2.2/CodeFileSanity.exe
 before_build:
   - cmd: CodeFileSanity.exe
   - cmd: nuget restore

osu.Desktop.Deploy/Properties/AssemblyInfo.cs

@@ -4,7 +4,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("osu.Desktop.Deploy")]
@@ -16,8 +16,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
@@ -27,11 +27,11 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]

osu.Desktop.Tests/VisualTests.cs

@@ -13,10 +13,10 @@ using osu.Game.Modes.Taiko;
 namespace osu.Desktop.Tests
 {
     [TestFixture]
-    public class BenchmarkTest
+    public class VisualTests
     {
         [Test]
-        public void TestBenchmark()
+        public void TestVisualTests()
         {
             using (var host = new HeadlessGameHost())
             {
@@ -25,7 +25,7 @@ namespace osu.Desktop.Tests
                 Ruleset.Register(new ManiaRuleset());
                 Ruleset.Register(new CatchRuleset());
 
-                host.Run(new Benchmark());
+                host.Run(new AutomatedVisualTestGame());
             }
         }
     }

osu.Desktop.Tests/osu.Desktop.Tests.csproj

@@ -56,7 +56,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BenchmarkTest.cs" />
+    <Compile Include="VisualTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu-framework\osu.Framework.Desktop\osu.Framework.Desktop.csproj">

osu.Desktop.VisualTests/AutomatedVisualTestGame.cs

@@ -0,0 +1,20 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Testing;
+using osu.Game;
+
+namespace osu.Desktop.VisualTests
+{
+    public class AutomatedVisualTestGame : OsuGameBase
+    {
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            // Have to construct this here, rather than in the constructor, because
+            // we depend on some dependencies to be loaded within OsuGameBase.load().
+            Add(new TestRunner(new TestBrowser()));
+        }
+    }
+}

osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs

@@ -16,7 +16,7 @@ namespace osu.Desktop.VisualTests.Beatmaps
         }
 
         private readonly Beatmap beatmap;
-        
+
         protected override Beatmap GetBeatmap() => beatmap;
         protected override Texture GetBackground() => null;
         protected override Track GetTrack() => null;

osu.Desktop.VisualTests/Benchmark.cs

@@ -1,45 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System;
-using osu.Framework.Allocation;
-using osu.Framework.Testing;
-using osu.Game;
-
-namespace osu.Desktop.VisualTests
-{
-    public class Benchmark : OsuGameBase
-    {
-        private const double time_per_test = 200;
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            Host.MaximumDrawHz = int.MaxValue;
-            Host.MaximumUpdateHz = int.MaxValue;
-            Host.MaximumInactiveHz = int.MaxValue;
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            TestBrowser f = new TestBrowser();
-            Add(f);
-
-            Console.WriteLine($@"{Time}: Running {f.TestCount} tests for {time_per_test}ms each...");
-
-            for (int i = 1; i < f.TestCount; i++)
-            {
-                int loadableCase = i;
-                Scheduler.AddDelayed(delegate
-                {
-                    f.LoadTest(loadableCase);
-                    Console.WriteLine($@"{Time}: Switching to test #{loadableCase}");
-                }, loadableCase * time_per_test);
-            }
-
-            Scheduler.AddDelayed(Host.Exit, f.TestCount * time_per_test);
-        }
-    }
-}

osu.Desktop.VisualTests/Platform/TestStorage.cs

@@ -15,7 +15,7 @@ namespace osu.Desktop.VisualTests.Platform
         public TestStorage(string baseName) : base(baseName)
         {
         }
-        
+
         public override SQLiteConnection GetDatabase(string name)
         {
             ISQLitePlatform platform;

osu.Desktop.VisualTests/Program.cs

@@ -27,7 +27,7 @@ namespace osu.Desktop.VisualTests
                 Ruleset.Register(new CatchRuleset());
 
                 if (benchmark)
-                    host.Run(new Benchmark());
+                    host.Run(new AutomatedVisualTestGame());
                 else
                     host.Run(new VisualTestGame());
             }

osu.Desktop.VisualTests/Tests/TestCaseBeatmapOptionsOverlay.cs

@@ -26,7 +26,7 @@ namespace osu.Desktop.VisualTests.Tests
 
             Add(overlay);
 
-            AddButton(@"Toggle", overlay.ToggleVisibility);
+            AddStep(@"Toggle", overlay.ToggleVisibility);
         }
     }
 }

osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs

@@ -3,15 +3,12 @@
 
 using osu.Framework.Testing;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Threading;
 using osu.Game.Overlays;
 
 namespace osu.Desktop.VisualTests.Tests
 {
     internal class TestCaseChatDisplay : TestCase
     {
-        private ScheduledDelegate messageRequest;
-
         public override string Description => @"Testing chat api and overlay";
 
         public override void Reset()

osu.Desktop.VisualTests/Tests/TestCaseDialogOverlay.cs

@@ -20,7 +20,7 @@ namespace osu.Desktop.VisualTests.Tests
 
             Add(overlay = new DialogOverlay());
 
-            AddButton("dialog #1", () => overlay.Push(new PopupDialog
+            AddStep("dialog #1", () => overlay.Push(new PopupDialog
             {
                 Icon = FontAwesome.fa_trash_o,
                 HeaderText = @"Confirm deletion of",
@@ -40,7 +40,7 @@ namespace osu.Desktop.VisualTests.Tests
                 },
             }));
 
-            AddButton("dialog #2", () => overlay.Push(new PopupDialog
+            AddStep("dialog #2", () => overlay.Push(new PopupDialog
             {
                 Icon = FontAwesome.fa_gear,
                 HeaderText = @"What do you want to do with",

osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs

@@ -93,21 +93,32 @@ namespace osu.Desktop.VisualTests.Tests
 
             playbackSpeed.TriggerChange();
 
-            AddButton(@"circles", () => load(HitObjectType.Circle));
-            AddButton(@"slider", () => load(HitObjectType.Slider));
-            AddButton(@"spinner", () => load(HitObjectType.Spinner));
+            AddStep(@"circles", () => load(HitObjectType.Circle));
+            AddStep(@"slider", () => load(HitObjectType.Slider));
+            AddStep(@"spinner", () => load(HitObjectType.Spinner));
 
-            AddToggle(@"auto", state => { auto = state; load(mode); });
+            AddToggleStep(@"auto", state => { auto = state; load(mode); });
 
-            ButtonsContainer.Add(new SpriteText { Text = "Playback Speed" });
-            ButtonsContainer.Add(new BasicSliderBar<double>
+            BasicSliderBar<double> sliderBar;
+            Add(new Container
             {
-                Width = 150,
-                Height = 10,
-                SelectionColor = Color4.Orange,
-                Bindable = playbackSpeed
+                Anchor = Anchor.TopRight,
+                Origin = Anchor.TopRight,
+                AutoSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    new SpriteText { Text = "Playback Speed" },
+                    sliderBar = new BasicSliderBar<double>
+                    {
+                        Width = 150,
+                        Height = 10,
+                        SelectionColor = Color4.Orange,
+                    }
+                }
             });
 
+            sliderBar.Current.BindTo(playbackSpeed);
+
             framedClock.ProcessFrame();
 
             var clockAdjustContainer = new Container

osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs

@@ -6,6 +6,7 @@ using osu.Framework.Graphics;
 using OpenTK.Input;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Configuration;
+using osu.Framework.Graphics.Containers;
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.MathUtils;
@@ -37,19 +38,33 @@ namespace osu.Desktop.VisualTests.Tests
             };
             BindableInt bindable = new BindableInt { MinValue = 0, MaxValue = 200, Default = 50 };
             bindable.ValueChanged += delegate { kc.FadeTime = bindable.Value; };
-            AddButton("Add Random", () =>
+            AddStep("Add Random", () =>
             {
                 Key key = (Key)((int)Key.A + RNG.Next(26));
                 kc.Add(new KeyCounterKeyboard(key));
             });
-            ButtonsContainer.Add(new SpriteText { Text = "FadeTime" });
-            ButtonsContainer.Add(new TestSliderBar<int>
+
+            TestSliderBar<int> sliderBar;
+
+            Add(new Container
             {
-                Width = 150,
-                Height = 10,
-                SelectionColor = Color4.Orange,
-                Bindable = bindable
+                Anchor = Anchor.TopRight,
+                Origin = Anchor.TopRight,
+                AutoSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    new SpriteText { Text = "FadeTime" },
+                    sliderBar =new TestSliderBar<int>
+                    {
+                        Width = 150,
+                        Height = 10,
+                        SelectionColor = Color4.Orange,
+                    }
+                }
             });
+
+            sliderBar.Current.BindTo(bindable);
+
             Add(kc);
         }
         private class TestSliderBar<T> : SliderBar<T> where T : struct

osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs

@@ -218,7 +218,7 @@ namespace osu.Desktop.VisualTests.Tests
                 Size = new Vector2(550f, 450f),
             });
 
-            AddButton(@"New Scores", newScores);
+            AddStep(@"New Scores", newScores);
             newScores();
         }
     }

osu.Desktop.VisualTests/Tests/TestCaseMenuOverlays.cs

@@ -0,0 +1,59 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Logging;
+using osu.Framework.Testing;
+using osu.Game.Screens.Play;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseMenuOverlays : TestCase
+    {
+        public override string Description => @"Tests pause and fail overlays";
+
+        private PauseOverlay pauseOverlay;
+        private FailOverlay failOverlay;
+        private int retryCount;
+
+        public override void Reset()
+        {
+            base.Reset();
+
+            retryCount = 0;
+
+            Add(pauseOverlay = new PauseOverlay
+            {
+                OnResume = () => Logger.Log(@"Resume"),
+                OnRetry = () => Logger.Log(@"Retry"),
+                OnQuit = () => Logger.Log(@"Quit"),
+            });
+            Add(failOverlay = new FailOverlay
+            {
+                OnRetry = () => Logger.Log(@"Retry"),
+                OnQuit = () => Logger.Log(@"Quit"),
+            });
+
+            AddStep(@"Pause", delegate {
+                if(failOverlay.State == Visibility.Visible)
+                {
+                    failOverlay.Hide();
+                }
+                pauseOverlay.Show();
+            });
+            AddStep("Fail", delegate {
+                if (pauseOverlay.State == Visibility.Visible)
+                {
+                    pauseOverlay.Hide();
+                }
+                failOverlay.Show();
+            });
+            AddStep("Add Retry", delegate
+            {
+                retryCount++;
+                pauseOverlay.Retries = retryCount;
+                failOverlay.Retries = retryCount;
+            });
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseModSelectOverlay.cs

@@ -25,11 +25,11 @@ namespace osu.Desktop.VisualTests.Tests
                 Anchor = Anchor.BottomCentre,
             });
 
-            AddButton("Toggle", modSelect.ToggleVisibility);
-            AddButton("osu!", () => modSelect.PlayMode.Value = PlayMode.Osu);
-            AddButton("osu!taiko", () => modSelect.PlayMode.Value = PlayMode.Taiko);
-            AddButton("osu!catch", () => modSelect.PlayMode.Value = PlayMode.Catch);
-            AddButton("osu!mania", () => modSelect.PlayMode.Value = PlayMode.Mania);
+            AddStep("Toggle", modSelect.ToggleVisibility);
+            AddStep("osu!", () => modSelect.PlayMode.Value = PlayMode.Osu);
+            AddStep("osu!taiko", () => modSelect.PlayMode.Value = PlayMode.Taiko);
+            AddStep("osu!catch", () => modSelect.PlayMode.Value = PlayMode.Catch);
+            AddStep("osu!mania", () => modSelect.PlayMode.Value = PlayMode.Mania);
         }
     }
 }

osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs

@@ -30,7 +30,9 @@ namespace osu.Desktop.VisualTests.Tests
                 Anchor = Anchor.Centre
             };
             Add(mc);
-            AddToggle(@"Show", state => mc.State = state ? Visibility.Visible : Visibility.Hidden);
+
+            AddToggleStep(@"toggle visibility", state => mc.State = state ? Visibility.Visible : Visibility.Hidden);
+            AddStep(@"show", () => mc.State = Visibility.Visible);
         }
     }
 }

osu.Desktop.VisualTests/Tests/TestCaseNotificationManager.cs

@@ -30,13 +30,13 @@ namespace osu.Desktop.VisualTests.Tests
                 Origin = Anchor.TopRight,
             });
 
-            AddToggle(@"show", state => manager.State = state ? Visibility.Visible : Visibility.Hidden);
+            AddToggleStep(@"show", state => manager.State = state ? Visibility.Visible : Visibility.Hidden);
 
-            AddButton(@"simple #1", sendNotification1);
-            AddButton(@"simple #2", sendNotification2);
-            AddButton(@"progress #1", sendProgress1);
-            AddButton(@"progress #2", sendProgress2);
-            AddButton(@"barrage", () => sendBarrage());
+            AddStep(@"simple #1", sendNotification1);
+            AddStep(@"simple #2", sendNotification2);
+            AddStep(@"progress #1", sendProgress1);
+            AddStep(@"progress #2", sendProgress2);
+            AddStep(@"barrage", () => sendBarrage());
         }
 
         private void sendBarrage(int remaining = 100)

osu.Desktop.VisualTests/Tests/TestCasePauseOverlay.cs

@@ -1,38 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Logging;
-using osu.Framework.Testing;
-using osu.Game.Screens.Play;
-
-namespace osu.Desktop.VisualTests.Tests
-{
-    internal class TestCasePauseOverlay : TestCase
-    {
-        public override string Description => @"Tests the pause overlay";
-
-        private PauseOverlay pauseOverlay;
-        private int retryCount;
-
-        public override void Reset()
-        {
-            base.Reset();
-
-            Add(pauseOverlay = new PauseOverlay
-            {
-                Depth = -1,
-                OnResume = () => Logger.Log(@"Resume"),
-                OnRetry = () => Logger.Log(@"Retry"),
-                OnQuit = () => Logger.Log(@"Quit")
-            });
-            AddButton("Pause", pauseOverlay.Show);
-            AddButton("Add Retry", delegate
-            {
-                retryCount++;
-                pauseOverlay.Retries = retryCount;
-            });
-
-            retryCount = 0;
-        }
-    }
-}

osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs

@@ -14,7 +14,7 @@ namespace osu.Desktop.VisualTests.Tests
 {
     internal class TestCasePlaySongSelect : TestCase
     {
-        private BeatmapDatabase db, oldDb;
+        private BeatmapDatabase db;
         private TestStorage storage;
         private PlaySongSelect songSelect;
 
@@ -23,12 +23,10 @@ namespace osu.Desktop.VisualTests.Tests
         public override void Reset()
         {
             base.Reset();
-            oldDb = Dependencies.Get<BeatmapDatabase>();
             if (db == null)
             {
                 storage = new TestStorage(@"TestCasePlaySongSelect");
                 db = new BeatmapDatabase(storage);
-                Dependencies.Cache(db, true);
 
                 var sets = new List<BeatmapSetInfo>();
 
@@ -40,22 +38,19 @@ namespace osu.Desktop.VisualTests.Tests
 
             Add(songSelect = new PlaySongSelect());
 
-            AddButton(@"Sort by Artist", delegate { songSelect.FilterControl.Sort = SortMode.Artist; });
-            AddButton(@"Sort by Title", delegate { songSelect.FilterControl.Sort = SortMode.Title; });
-            AddButton(@"Sort by Author", delegate { songSelect.FilterControl.Sort = SortMode.Author; });
-            AddButton(@"Sort by Difficulty", delegate { songSelect.FilterControl.Sort = SortMode.Difficulty; });
+            AddStep(@"Sort by Artist", delegate { songSelect.FilterControl.Sort = SortMode.Artist; });
+            AddStep(@"Sort by Title", delegate { songSelect.FilterControl.Sort = SortMode.Title; });
+            AddStep(@"Sort by Author", delegate { songSelect.FilterControl.Sort = SortMode.Author; });
+            AddStep(@"Sort by Difficulty", delegate { songSelect.FilterControl.Sort = SortMode.Difficulty; });
         }
 
-        protected override void Dispose(bool isDisposing)
-        {
-            if (oldDb != null)
-            {
-                Dependencies.Cache(oldDb, true);
-                db = null;
-            }
+        //protected override void Dispose(bool isDisposing)
+        //{
+        //    if (oldDb != null)
+        //        db = null;
 
-            base.Dispose(isDisposing);
-        }
+        //    base.Dispose(isDisposing);
+        //}
 
         private BeatmapSetInfo createTestBeatmapSet(int i)
         {

osu.Desktop.VisualTests/Tests/TestCaseReplay.cs

@@ -1,24 +1,15 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Input.Handlers;
 using osu.Game.Beatmaps;
 using osu.Game.Modes.Mods;
 using osu.Game.Modes.Osu.Mods;
 using osu.Game.Screens.Play;
-using System;
-using System.IO;
 
 namespace osu.Desktop.VisualTests.Tests
 {
     internal class TestCaseReplay : TestCasePlayer
     {
-        private WorkingBeatmap beatmap;
-
-        private InputHandler replay;
-
-        private Func<Stream> getReplayStream;
-
         public override string Description => @"Testing replay playback.";
 
         protected override Player CreatePlayer(WorkingBeatmap beatmap)

osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs

@@ -22,8 +22,6 @@ namespace osu.Desktop.VisualTests.Tests
 
             int numerator = 0, denominator = 0;
 
-            bool maniaHold = false;
-
             ScoreCounter score = new ScoreCounter(7)
             {
                 Origin = Anchor.TopRight,
@@ -68,7 +66,7 @@ namespace osu.Desktop.VisualTests.Tests
             };
             Add(starsLabel);
 
-            AddButton(@"Reset all", delegate
+            AddStep(@"Reset all", delegate
             {
                 score.Current.Value = 0;
                 comboCounter.Current.Value = 0;
@@ -78,7 +76,7 @@ namespace osu.Desktop.VisualTests.Tests
                 starsLabel.Text = stars.Count.ToString("0.00");
             });
 
-            AddButton(@"Hit! :D", delegate
+            AddStep(@"Hit! :D", delegate
             {
                 score.Current.Value += 300 + (ulong)(300.0 * (comboCounter.Current > 0 ? comboCounter.Current - 1 : 0) / 25.0);
                 comboCounter.Increment();
@@ -86,20 +84,20 @@ namespace osu.Desktop.VisualTests.Tests
                 accuracyCounter.SetFraction(numerator, denominator);
             });
 
-            AddButton(@"miss...", delegate
+            AddStep(@"miss...", delegate
             {
                 comboCounter.Current.Value = 0;
                 denominator++;
                 accuracyCounter.SetFraction(numerator, denominator);
             });
 
-            AddButton(@"Alter stars", delegate
+            AddStep(@"Alter stars", delegate
             {
                 stars.Count = RNG.NextSingle() * (stars.StarCount + 1);
                 starsLabel.Text = stars.Count.ToString("0.00");
             });
 
-            AddButton(@"Stop counters", delegate
+            AddStep(@"Stop counters", delegate
             {
                 score.StopRolling();
                 comboCounter.StopRolling();

osu.Desktop.VisualTests/Tests/TestCaseTabControl.cs

@@ -36,9 +36,9 @@ namespace osu.Desktop.VisualTests.Tests
             filter.PinItem(GroupMode.All);
             filter.PinItem(GroupMode.RecentlyPlayed);
 
-            filter.ItemChanged += (sender, mode) =>
+            filter.Current.ValueChanged += newFilter =>
             {
-                text.Text = "Currently Selected: " + mode.ToString();
+                text.Text = "Currently Selected: " + newFilter.ToString();
             };
         }
     }

osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs

@@ -1,16 +1,12 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System.Linq;
 using OpenTK;
 using OpenTK.Graphics;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
-using osu.Game.Graphics;
-using osu.Game.Modes.Taiko.Objects;
-using osu.Game.Modes.Taiko.Objects.Drawable.Pieces;
+using osu.Game.Modes.Taiko.Objects.Drawables.Pieces;
 
 namespace osu.Desktop.VisualTests.Tests
 {
@@ -24,181 +20,94 @@ namespace osu.Desktop.VisualTests.Tests
         {
             base.Reset();
 
-            AddToggle("Kiai", b =>
+            AddToggleStep("Kiai", b =>
             {
                 kiai = !kiai;
-                Reset();
+                updateKiaiState();
             });
 
-            Add(new CentreHitCircle(new CirclePiece()
+            Add(new CirclePiece
             {
-                KiaiMode = kiai
-            })
-            {
-                Position = new Vector2(100, 100)
-            });
-
-            Add(new CentreHitCircle(new StrongCirclePiece()
-            {
-                KiaiMode = kiai
-            })
-            {
-                Position = new Vector2(350, 100)
-            });
-
-            Add(new RimHitCircle(new CirclePiece()
-            {
-                KiaiMode = kiai
-            })
-            {
-                Position = new Vector2(100, 300)
-            });
-
-            Add(new RimHitCircle(new StrongCirclePiece()
-            {
-                KiaiMode = kiai
-            })
-            {
-                Position = new Vector2(350, 300)
-            });
-
-            Add(new SwellCircle(new CirclePiece()
-            {
-                KiaiMode = kiai
-            })
-            {
-                Position = new Vector2(100, 500)
-            });
-
-            Add(new SwellCircle(new StrongCirclePiece()
-            {
-                KiaiMode = kiai
-            })
-            {
-                Position = new Vector2(350, 500)
-            });
-
-            Add(new DrumRollCircle(new CirclePiece()
-            {
-                KiaiMode = kiai
-            })
-            {
-                Width = 250,
-                Position = new Vector2(575, 100)
-            });
-
-            Add(new DrumRollCircle(new StrongCirclePiece()
-            {
-                KiaiMode = kiai
-            })
-            {
-                Width = 250,
-                Position = new Vector2(575, 300)
-            });
-        }
-
-        private class SwellCircle : BaseCircle
-        {
-            public SwellCircle(CirclePiece piece)
-                : base(piece)
-            {
-                Piece.Add(new TextAwesome
+                Position = new Vector2(100, 100),
+                AccentColour = Color4.DarkRed,
+                KiaiMode = kiai,
+                Children = new[]
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    TextSize = SYMBOL_INNER_SIZE,
-                    Icon = FontAwesome.fa_asterisk,
-                    Shadow = false
-                });
-            }
+                    new CentreHitSymbolPiece()
+                }
+            });
 
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
+            Add(new CirclePiece(true)
             {
-                Piece.AccentColour = colours.YellowDark;
-            }
-        }
-
-        private class DrumRollCircle : BaseCircle
-        {
-            public DrumRollCircle(CirclePiece piece)
-                : base(piece)
-            {
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                Piece.AccentColour = colours.YellowDark;
-            }
-        }
-
-        private class CentreHitCircle : BaseCircle
-        {
-            public CentreHitCircle(CirclePiece piece)
-                : base(piece)
-            {
-                Piece.Add(new CircularContainer
+                Position = new Vector2(350, 100),
+                AccentColour = Color4.DarkRed,
+                KiaiMode = kiai,
+                Children = new[]
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Size = new Vector2(SYMBOL_INNER_SIZE),
-                    Masking = true,
-                    Children = new[]
-                    {
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both
-                        }
-                    }
-                });
-            }
+                    new CentreHitSymbolPiece()
+                }
+            });
 
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
+            Add(new CirclePiece
             {
-                Piece.AccentColour = colours.PinkDarker;
-            }
+                Position = new Vector2(100, 300),
+                AccentColour = Color4.DarkBlue,
+                KiaiMode = kiai,
+                Children = new[]
+                {
+                    new RimHitSymbolPiece()
+                }
+            });
+
+            Add(new CirclePiece(true)
+            {
+                Position = new Vector2(350, 300),
+                AccentColour = Color4.DarkBlue,
+                KiaiMode = kiai,
+                Children = new[]
+                {
+                    new RimHitSymbolPiece()
+                }
+            });
+
+            Add(new CirclePiece
+            {
+                Position = new Vector2(100, 500),
+                AccentColour = Color4.Orange,
+                KiaiMode = kiai,
+                Children = new[]
+                {
+                    new SwellSymbolPiece()
+                }
+            });
+
+            Add(new ElongatedCirclePiece
+            {
+                Position = new Vector2(575, 100),
+                AccentColour = Color4.Orange,
+                KiaiMode = kiai,
+                Length = 0.10f,
+                PlayfieldLengthReference = () => DrawSize.X
+            });
+
+            Add(new ElongatedCirclePiece(true)
+            {
+                Position = new Vector2(575, 300),
+                AccentColour = Color4.Orange,
+                KiaiMode = kiai,
+                Length = 0.10f,
+                PlayfieldLengthReference = () => DrawSize.X
+            });
         }
 
-        private class RimHitCircle : BaseCircle
+        private void updateKiaiState()
         {
-            public RimHitCircle(CirclePiece piece)
-                : base(piece)
-            {
-                Piece.Add(new CircularContainer
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Size = new Vector2(SYMBOL_SIZE),
-                    BorderThickness = SYMBOL_BORDER,
-                    BorderColour = Color4.White,
-                    Masking = true,
-                    Children = new[]
-                    {
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Alpha = 0,
-                            AlwaysPresent = true
-                        }
-                    }
-                });
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                Piece.AccentColour = colours.BlueDarker;
-            }
+            foreach (var c in Children.OfType<CirclePiece>())
+                c.KiaiMode = kiai;
         }
 
         private abstract class BaseCircle : Container
         {
-            protected const float SYMBOL_SIZE = TaikoHitObject.CIRCLE_RADIUS * 2f * 0.45f;
-            protected const float SYMBOL_BORDER = 8;
-            protected const float SYMBOL_INNER_SIZE = SYMBOL_SIZE - 2 * SYMBOL_BORDER;
-
             protected readonly CirclePiece Piece;
 
             protected BaseCircle(CirclePiece piece)

osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs

@@ -1,50 +1,115 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using OpenTK;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.MathUtils;
 using osu.Framework.Testing;
+using osu.Framework.Timing;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Taiko.Judgements;
 using osu.Game.Modes.Taiko.Objects;
+using osu.Game.Modes.Taiko.Objects.Drawables;
 using osu.Game.Modes.Taiko.UI;
+using System;
 
 namespace osu.Desktop.VisualTests.Tests
 {
     internal class TestCaseTaikoPlayfield : TestCase
     {
+        private const double default_duration = 300;
+        private const float scroll_time = 1000;
+
         public override string Description => "Taiko playfield";
 
+        protected override double TimePerAction => default_duration * 2;
+
+        private readonly Random rng = new Random(1337);
         private TaikoPlayfield playfield;
 
         public override void Reset()
         {
             base.Reset();
 
-            AddButton("Hit!", addHitJudgement);
-            AddButton("Miss :(", addMissJudgement);
+            AddStep("Hit!", addHitJudgement);
+            AddStep("Miss :(", addMissJudgement);
+            AddStep("DrumRoll", () => addDrumRoll(false));
+            AddStep("Strong DrumRoll", () => addDrumRoll(true));
+            AddStep("Swell", () => addSwell());
+            AddStep("Centre", () => addCentreHit(false));
+            AddStep("Strong Centre", () => addCentreHit(true));
+            AddStep("Rim", () => addRimHit(false));
+            AddStep("Strong Rim", () => addRimHit(true));
+            AddStep("Add bar line", () => addBarLine(false));
+            AddStep("Add major bar line", () => addBarLine(true));
+            AddStep("Height test 1", () => changePlayfieldSize(1));
+            AddStep("Height test 2", () => changePlayfieldSize(2));
+            AddStep("Height test 3", () => changePlayfieldSize(3));
+            AddStep("Height test 4", () => changePlayfieldSize(4));
+            AddStep("Height test 5", () => changePlayfieldSize(5));
 
-            Add(playfield = new TaikoPlayfield
+            var rateAdjustClock = new StopwatchClock(true) { Rate = 1 };
+
+            Add(new Container
             {
-                Y = 200
+                Clock = new FramedClock(rateAdjustClock),
+                RelativeSizeAxes = Axes.X,
+                Y = 200,
+                Children = new[]
+                {
+                    playfield = new TaikoPlayfield()
+                }
             });
         }
 
+        private void changePlayfieldSize(int step)
+        {
+            switch (step)
+            {
+                case 1:
+                    addCentreHit(false);
+                    break;
+                case 2:
+                    addCentreHit(true);
+                    break;
+                case 3:
+                    addDrumRoll(false);
+                    break;
+                case 4:
+                    addDrumRoll(true);
+                    break;
+                case 5:
+                    addSwell(1000);
+                    playfield.Delay(scroll_time - 100);
+                    break;
+            }
+
+            playfield.ResizeTo(new Vector2(1, rng.Next(25, 400)), 500);
+        }
+
         private void addHitJudgement()
         {
             TaikoHitResult hitResult = RNG.Next(2) == 0 ? TaikoHitResult.Good : TaikoHitResult.Great;
 
-            playfield.OnJudgement(new DrawableTestHit(new Hit())
+            var h = new DrawableTestHit(new Hit())
             {
                 X = RNG.NextSingle(hitResult == TaikoHitResult.Good ? -0.1f : -0.05f, hitResult == TaikoHitResult.Good ? 0.1f : 0.05f),
                 Judgement = new TaikoJudgement
                 {
                     Result = HitResult.Hit,
                     TaikoResult = hitResult,
-                    TimeOffset = 0,
-                    ComboAtHit = 1,
-                    SecondHit = RNG.Next(10) == 0
+                    TimeOffset = 0
                 }
-            });
+            };
+
+            playfield.OnJudgement(h);
+
+            if (RNG.Next(10) == 0)
+            {
+                h.Judgement.SecondHit = true;
+                playfield.OnJudgement(h);
+            }
         }
 
         private void addMissJudgement()
@@ -54,12 +119,76 @@ namespace osu.Desktop.VisualTests.Tests
                 Judgement = new TaikoJudgement
                 {
                     Result = HitResult.Miss,
-                    TimeOffset = 0,
-                    ComboAtHit = 0
+                    TimeOffset = 0
                 }
             });
         }
 
+        private void addBarLine(bool major, double delay = scroll_time)
+        {
+            BarLine bl = new BarLine
+            {
+                StartTime = playfield.Time.Current + delay,
+                ScrollTime = scroll_time
+            };
+
+            playfield.AddBarLine(major ? new DrawableBarLineMajor(bl) : new DrawableBarLine(bl));
+        }
+
+        private void addSwell(double duration = default_duration)
+        {
+            playfield.Add(new DrawableSwell(new Swell
+            {
+                StartTime = playfield.Time.Current + scroll_time,
+                Duration = duration,
+                ScrollTime = scroll_time
+            }));
+        }
+
+        private void addDrumRoll(bool strong, double duration = default_duration)
+        {
+            addBarLine(true);
+            addBarLine(true, scroll_time + duration);
+
+            var d = new DrumRoll
+            {
+                StartTime = playfield.Time.Current + scroll_time,
+                IsStrong = strong,
+                Duration = duration,
+                ScrollTime = scroll_time,
+            };
+
+            playfield.Add(new DrawableDrumRoll(d));
+        }
+
+        private void addCentreHit(bool strong)
+        {
+            Hit h = new Hit
+            {
+                StartTime = playfield.Time.Current + scroll_time,
+                ScrollTime = scroll_time
+            };
+
+            if (strong)
+                playfield.Add(new DrawableCentreHitStrong(h));
+            else
+                playfield.Add(new DrawableCentreHit(h));
+        }
+
+        private void addRimHit(bool strong)
+        {
+            Hit h = new Hit
+            {
+                StartTime = playfield.Time.Current + scroll_time,
+                ScrollTime = scroll_time
+            };
+
+            if (strong)
+                playfield.Add(new DrawableRimHitStrong(h));
+            else
+                playfield.Add(new DrawableRimHit(h));
+        }
+
         private class DrawableTestHit : DrawableHitObject<TaikoHitObject, TaikoJudgement>
         {
             public DrawableTestHit(TaikoHitObject hitObject)

osu.Desktop.VisualTests/VisualTestGame.cs

@@ -14,7 +14,7 @@ namespace osu.Desktop.VisualTests
         {
             base.LoadComplete();
 
-            new BackgroundScreenDefault { Depth = 10 }.LoadAsync(this, AddInternal);
+            LoadComponentAsync(new BackgroundScreenDefault { Depth = 10 }, AddInternal);
 
             // Have to construct this here, rather than in the constructor, because
             // we depend on some dependencies to be loaded within OsuGameBase.load().

osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj

@@ -184,11 +184,12 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Benchmark.cs" />
+    <Compile Include="AutomatedVisualTestGame.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Tests\TestCaseChatDisplay.cs" />
     <Compile Include="Tests\TestCaseDrawings.cs" />
     <Compile Include="Tests\TestCaseGamefield.cs" />
+    <Compile Include="Tests\TestCaseMenuOverlays.cs" />
     <Compile Include="Tests\TestCaseMusicController.cs" />
     <Compile Include="Tests\TestCaseNotificationManager.cs" />
     <Compile Include="Tests\TestCasePlayer.cs" />
@@ -206,7 +207,6 @@
     <Compile Include="VisualTestGame.cs" />
     <Compile Include="Platform\TestStorage.cs" />
     <Compile Include="Tests\TestCaseOptions.cs" />
-    <Compile Include="Tests\TestCasePauseOverlay.cs" />
     <Compile Include="Tests\TestCaseModSelectOverlay.cs" />
     <Compile Include="Tests\TestCaseDialogOverlay.cs" />
     <Compile Include="Tests\TestCaseBeatmapOptionsOverlay.cs" />

osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs

@@ -3,10 +3,7 @@
 
 using System.IO;
 using System.Linq;
-using osu.Game.Beatmaps.Formats;
 using osu.Game.Beatmaps.IO;
-using osu.Game.Beatmaps;
-using osu.Game.Database;
 
 namespace osu.Desktop.Beatmaps.IO
 {
@@ -18,20 +15,17 @@ namespace osu.Desktop.Beatmaps.IO
         public static void Register() => AddReader<LegacyFilesystemReader>((storage, path) => Directory.Exists(path));
 
         private string basePath { get; }
-        private Beatmap firstMap { get; }
 
         public LegacyFilesystemReader(string path)
         {
             basePath = path;
+
             BeatmapFilenames = Directory.GetFiles(basePath, @"*.osu").Select(Path.GetFileName).ToArray();
+
             if (BeatmapFilenames.Length == 0)
                 throw new FileNotFoundException(@"This directory contains no beatmaps");
+
             StoryboardFilename = Directory.GetFiles(basePath, @"*.osb").Select(Path.GetFileName).FirstOrDefault();
-            using (var stream = new StreamReader(GetStream(BeatmapFilenames[0])))
-            {
-                var decoder = BeatmapDecoder.GetDecoder(stream);
-                firstMap = decoder.Decode(stream);
-            }
         }
 
         public override Stream GetStream(string name)
@@ -39,11 +33,6 @@ namespace osu.Desktop.Beatmaps.IO
             return File.OpenRead(Path.Combine(basePath, name));
         }
 
-        public override BeatmapMetadata ReadMetadata()
-        {
-            return firstMap.BeatmapInfo.Metadata;
-        }
-
         public override void Dispose()
         {
             // no-op

osu.Desktop/OpenTK.dll.config

@@ -0,0 +1,29 @@
+<!--
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+-->
+<configuration>
+  <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
+  <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>
+  <dllmap os="linux" dll="openal32.dll" target="libopenal.so.1"/>
+  <dllmap os="linux" dll="alut.dll" target="libalut.so.0"/>
+  <dllmap os="linux" dll="opencl.dll" target="libOpenCL.so"/>
+  <dllmap os="linux" dll="libX11" target="libX11.so.6"/>
+  <dllmap os="linux" dll="libXi" target="libXi.so.6"/>
+  <dllmap os="linux" dll="SDL2.dll" target="libSDL2-2.0.so.0"/>
+  <dllmap os="osx" dll="opengl32.dll" target="/System/Library/Frameworks/OpenGL.framework/OpenGL"/>
+  <dllmap os="osx" dll="openal32.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
+  <dllmap os="osx" dll="alut.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
+  <dllmap os="osx" dll="libGLES.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
+  <dllmap os="osx" dll="libGLESv1_CM.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
+  <dllmap os="osx" dll="libGLESv2.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
+  <dllmap os="osx" dll="opencl.dll" target="/System/Library/Frameworks/OpenCL.framework/OpenCL"/>
+  <dllmap os="osx" dll="SDL2.dll" target="libSDL2.dylib"/>
+  <!-- XQuartz compatibility (X11 on Mac) -->
+  <dllmap os="osx" dll="libGL.so.1" target="/usr/X11/lib/libGL.dylib"/>
+  <dllmap os="osx" dll="libX11" target="/usr/X11/lib/libX11.dylib"/>
+  <dllmap os="osx" dll="libXcursor.so.1" target="/usr/X11/lib/libXcursor.dylib"/>
+  <dllmap os="osx" dll="libXi" target="/usr/X11/lib/libXi.dylib"/>
+  <dllmap os="osx" dll="libXinerama" target="/usr/X11/lib/libXinerama.dylib"/>
+  <dllmap os="osx" dll="libXrandr.so.2" target="/usr/X11/lib/libXrandr.dylib"/>
+</configuration>

osu.Desktop/OsuGameDesktop.cs

@@ -29,7 +29,7 @@ namespace osu.Desktop
         {
             base.LoadComplete();
 
-            versionManager.LoadAsync(this);
+            LoadComponentAsync(versionManager);
             ScreenChanged += s =>
             {
                 if (!versionManager.IsAlive && s is Intro)

osu.Desktop/Properties/AssemblyInfo.cs

@@ -4,7 +4,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("osu!lazer")]
@@ -16,8 +16,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 

osu.Desktop/osu.Desktop.csproj

@@ -123,7 +123,10 @@
       <HintPath>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\NuGet.Squirrel.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4" />
+    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1340\lib\net45\OpenTK.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Splat, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\Splat.2.0.0\lib\Net45\Splat.dll</HintPath>
       <Private>True</Private>
@@ -150,6 +153,7 @@
     <None Include="..\osu.licenseheader">
       <Link>osu.licenseheader</Link>
     </None>
+    <None Include="OpenTK.dll.config" />
     <None Include="osu!.res" />
     <None Include="packages.config" />
     <None Include="Properties\app.manifest" />

osu.Desktop/packages.config

@@ -7,6 +7,7 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
   <package id="DeltaCompressionDotNet" version="1.1.0" targetFramework="net45" />
   <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
   <package id="Mono.Cecil" version="0.9.6.4" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="2.0.50727.1340" targetFramework="net45" />
   <package id="Splat" version="2.0.0" targetFramework="net45" />
   <package id="squirrel.windows" version="1.5.2" targetFramework="net45" />
 </packages>

osu.Game.Modes.Catch/Properties/AssemblyInfo.cs

@@ -4,7 +4,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("osu.Game.Modes.Catch")]
@@ -16,8 +16,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
@@ -27,11 +27,11 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]

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

@@ -19,7 +19,7 @@ namespace osu.Game.Modes.Catch.Scoring
         {
         }
 
-        protected override void OnNewJugement(CatchJudgement judgement)
+        protected override void OnNewJudgement(CatchJudgement judgement)
         {
         }
     }

osu.Game.Modes.Catch/UI/CatchPlayfield.cs

@@ -14,8 +14,7 @@ namespace osu.Game.Modes.Catch.UI
     {
         public CatchPlayfield()
         {
-            RelativeSizeAxes = Axes.Y;
-            Size = new Vector2(512, 0.9f);
+            Size = new Vector2(1, 0.9f);
             Anchor = Anchor.BottomCentre;
             Origin = Anchor.BottomCentre;
 

osu.Game.Modes.Mania/Properties/AssemblyInfo.cs

@@ -4,7 +4,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("osu.Game.Modes.Mania")]
@@ -16,8 +16,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
@@ -27,11 +27,11 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]

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

@@ -19,7 +19,7 @@ namespace osu.Game.Modes.Mania.Scoring
         {
         }
 
-        protected override void OnNewJugement(ManiaJudgement judgement)
+        protected override void OnNewJudgement(ManiaJudgement judgement)
         {
         }
     }

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

@@ -15,8 +15,7 @@ namespace osu.Game.Modes.Mania.UI
     {
         public ManiaPlayfield(int columns)
         {
-            RelativeSizeAxes = Axes.Both;
-            Size = new Vector2(columns / 20f, 1f);
+            Size = new Vector2(0.8f, 1f);
             Anchor = Anchor.BottomCentre;
             Origin = Anchor.BottomCentre;
 

osu.Game.Modes.Osu/Beatmaps/OsuBeatmapConverter.cs

@@ -43,7 +43,7 @@ namespace osu.Game.Modes.Osu.Beatmaps
                 return new Slider
                 {
                     StartTime = original.StartTime,
-                    Sample = original.Sample,
+                    Samples = original.Samples,
                     CurveObject = curveData,
                     Position = positionData?.Position ?? Vector2.Zero,
                     NewCombo = comboData?.NewCombo ?? false
@@ -55,7 +55,7 @@ namespace osu.Game.Modes.Osu.Beatmaps
                 return new Spinner
                 {
                     StartTime = original.StartTime,
-                    Sample = original.Sample,
+                    Samples = original.Samples,
                     Position = new Vector2(512, 384) / 2,
                     EndTime = endTimeData.EndTime
                 };
@@ -64,7 +64,7 @@ namespace osu.Game.Modes.Osu.Beatmaps
             return new HitCircle
             {
                 StartTime = original.StartTime,
-                Sample = original.Sample,
+                Samples = original.Samples,
                 Position = positionData?.Position ?? Vector2.Zero,
                 NewCombo = comboData?.NewCombo ?? false
             };

osu.Game.Modes.Osu/Objects/Drawables/Connections/FollowPoint.cs

@@ -32,7 +32,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Connections
                 Colour = Color4.White.Opacity(0.2f),
                 Radius = 4,
             };
-            
+
             Children = new Drawable[]
             {
                 new Box

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

@@ -38,7 +38,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
                     Colour = AccentColour,
                     Hit = () =>
                     {
-                        if (Judgement.Result.HasValue) return false;
+                        if (Judgement.Result != HitResult.None) return false;
 
                         Judgement.PositionOffset = Vector2.Zero; //todo: set to correct value
                         UpdateJudgement(true);

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

@@ -67,7 +67,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
                     ComboIndex = s.ComboIndex,
                     Scale = s.Scale,
                     ComboColour = s.ComboColour,
-                    Sample = s.Sample,
+                    Samples = s.Samples,
                 }),
             };
 
@@ -111,7 +111,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
             if (repeat > currentRepeat)
             {
                 if (repeat < slider.RepeatCount && ball.Tracking)
-                    PlaySample();
+                    PlaySamples();
                 currentRepeat = repeat;
             }
 

osu.Game.Modes.Osu/Objects/Drawables/DrawableSliderTick.cs

@@ -2,12 +2,8 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
-using osu.Framework.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Beatmaps.Samples;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Osu.Judgements;
 using OpenTK;
@@ -53,22 +49,6 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
             };
         }
 
-        private SampleChannel sample;
-
-        [BackgroundDependencyLoader]
-        private void load(AudioManager audio)
-        {
-            string sampleSet = (HitObject.Sample?.Set ?? SampleSet.Normal).ToString().ToLower();
-
-            sample = audio.Sample.Get($@"Gameplay/{sampleSet}-slidertick");
-        }
-
-        protected override void PlaySample()
-        {
-            sample?.Play();
-        }
-
-
         protected override void CheckJudgement(bool userTriggered)
         {
             if (Judgement.TimeOffset >= 0)
@@ -77,7 +57,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
                 Judgement.Score = Tracking ? OsuScoreResult.SliderTick : OsuScoreResult.Miss;
             }
         }
-        
+
         protected override void UpdatePreemptState()
         {
             var animIn = Math.Min(150, sliderTick.StartTime - FadeInTime);

osu.Game.Modes.Osu/Objects/Slider.cs

@@ -2,18 +2,24 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using OpenTK;
-using osu.Game.Beatmaps.Samples;
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Modes.Objects.Types;
 using System;
 using System.Collections.Generic;
 using osu.Game.Modes.Objects;
 using osu.Game.Database;
+using System.Linq;
+using osu.Game.Audio;
 
 namespace osu.Game.Modes.Osu.Objects
 {
     public class Slider : OsuHitObject, IHasCurve
     {
+        /// <summary>
+        /// Scoring distance with a speed-adjusted beat length of 1 second.
+        /// </summary>
+        private const float base_scoring_distance = 100;
+
         public IHasCurve CurveObject { get; set; }
 
         public SliderCurve Curve => CurveObject.Curve;
@@ -51,13 +57,10 @@ namespace osu.Game.Modes.Osu.Objects
         {
             base.ApplyDefaults(timing, difficulty);
 
-            ControlPoint overridePoint;
-            ControlPoint timingPoint = timing.TimingPointAt(StartTime, out overridePoint);
-            var velocityAdjustment = overridePoint?.VelocityAdjustment ?? 1;
-            var baseVelocity = 100 * difficulty.SliderMultiplier / velocityAdjustment;
+            double scoringDistance = base_scoring_distance * difficulty.SliderMultiplier / timing.SpeedMultiplierAt(StartTime);
 
-            Velocity = baseVelocity / timingPoint.BeatLength;
-            TickDistance = baseVelocity / difficulty.SliderTickRate;
+            Velocity = scoringDistance / timing.BeatLengthAt(StartTime);
+            TickDistance = scoringDistance / difficulty.SliderTickRate;
         }
 
         public IEnumerable<SliderTick> Ticks
@@ -93,11 +96,12 @@ namespace osu.Game.Modes.Osu.Objects
                             StackHeight = StackHeight,
                             Scale = Scale,
                             ComboColour = ComboColour,
-                            Sample = new HitSampleInfo
+                            Samples = Samples.Select(s => new SampleInfo
                             {
-                                Type = SampleType.None,
-                                Set = SampleSet.Soft,
-                            },
+                                Bank = s.Bank,
+                                Name = @"slidertick",
+                                Volume = s.Volume
+                            }).ToList()
                         };
                     }
                 }

osu.Game.Modes.Osu/OsuAutoReplay.cs

@@ -11,10 +11,11 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using osu.Framework.Graphics;
 using osu.Game.Modes.Objects.Types;
+using osu.Game.Modes.Replays;
 
 namespace osu.Game.Modes.Osu
 {
-    public class OsuAutoReplay : LegacyReplay
+    public class OsuAutoReplay : Replay
     {
         private static readonly Vector2 spinner_centre = new Vector2(256, 192);
 
@@ -29,17 +30,20 @@ namespace osu.Game.Modes.Osu
             createAutoReplay();
         }
 
-        private class LegacyReplayFrameComparer : IComparer<LegacyReplayFrame>
+        private class ReplayFrameComparer : IComparer<ReplayFrame>
         {
-            public int Compare(LegacyReplayFrame f1, LegacyReplayFrame f2)
+            public int Compare(ReplayFrame f1, ReplayFrame f2)
             {
+                if (f1 == null) throw new NullReferenceException($@"{nameof(f1)} cannot be null");
+                if (f2 == null) throw new NullReferenceException($@"{nameof(f2)} cannot be null");
+
                 return f1.Time.CompareTo(f2.Time);
             }
         }
 
-        private static readonly IComparer<LegacyReplayFrame> replay_frame_comparer = new LegacyReplayFrameComparer();
+        private static readonly IComparer<ReplayFrame> replay_frame_comparer = new ReplayFrameComparer();
 
-        private int findInsertionIndex(LegacyReplayFrame frame)
+        private int findInsertionIndex(ReplayFrame frame)
         {
             int index = Frames.BinarySearch(frame, replay_frame_comparer);
 
@@ -59,7 +63,7 @@ namespace osu.Game.Modes.Osu
             return index;
         }
 
-        private void addFrameToReplay(LegacyReplayFrame frame) => Frames.Insert(findInsertionIndex(frame), frame);
+        private void addFrameToReplay(ReplayFrame frame) => Frames.Insert(findInsertionIndex(frame), frame);
 
         private static Vector2 circlePosition(double t, double radius) => new Vector2((float)(Math.Cos(t) * radius), (float)(Math.Sin(t) * radius));
 
@@ -74,9 +78,9 @@ namespace osu.Game.Modes.Osu
 
             EasingTypes preferredEasing = DelayedMovements ? EasingTypes.InOutCubic : EasingTypes.Out;
 
-            addFrameToReplay(new LegacyReplayFrame(-100000, 256, 500, LegacyButtonState.None));
-            addFrameToReplay(new LegacyReplayFrame(beatmap.HitObjects[0].StartTime - 1500, 256, 500, LegacyButtonState.None));
-            addFrameToReplay(new LegacyReplayFrame(beatmap.HitObjects[0].StartTime - 1000, 256, 192, LegacyButtonState.None));
+            addFrameToReplay(new ReplayFrame(-100000, 256, 500, ReplayButtonState.None));
+            addFrameToReplay(new ReplayFrame(beatmap.HitObjects[0].StartTime - 1500, 256, 500, ReplayButtonState.None));
+            addFrameToReplay(new ReplayFrame(beatmap.HitObjects[0].StartTime - 1000, 256, 192, ReplayButtonState.None));
 
             // We are using ApplyModsToRate and not ApplyModsToTime to counteract the speed up / slow down from HalfTime / DoubleTime so that we remain at a constant framerate of 60 fps.
             float frameDelay = (float)applyModsToRate(1000.0 / 60.0);
@@ -106,18 +110,18 @@ namespace osu.Game.Modes.Osu
                     //Make the cursor stay at a hitObject as long as possible (mainly for autopilot).
                     if (h.StartTime - h.HitWindowFor(OsuScoreResult.Miss) > endTime + h.HitWindowFor(OsuScoreResult.Hit50) + 50)
                     {
-                        if (!(last is Spinner) && h.StartTime - endTime < 1000) addFrameToReplay(new LegacyReplayFrame(endTime + h.HitWindowFor(OsuScoreResult.Hit50), last.EndPosition.X, last.EndPosition.Y, LegacyButtonState.None));
-                        if (!(h is Spinner)) addFrameToReplay(new LegacyReplayFrame(h.StartTime - h.HitWindowFor(OsuScoreResult.Miss), h.Position.X, h.Position.Y, LegacyButtonState.None));
+                        if (!(last is Spinner) && h.StartTime - endTime < 1000) addFrameToReplay(new ReplayFrame(endTime + h.HitWindowFor(OsuScoreResult.Hit50), last.EndPosition.X, last.EndPosition.Y, ReplayButtonState.None));
+                        if (!(h is Spinner)) addFrameToReplay(new ReplayFrame(h.StartTime - h.HitWindowFor(OsuScoreResult.Miss), h.Position.X, h.Position.Y, ReplayButtonState.None));
                     }
                     else if (h.StartTime - h.HitWindowFor(OsuScoreResult.Hit50) > endTime + h.HitWindowFor(OsuScoreResult.Hit50) + 50)
                     {
-                        if (!(last is Spinner) && h.StartTime - endTime < 1000) addFrameToReplay(new LegacyReplayFrame(endTime + h.HitWindowFor(OsuScoreResult.Hit50), last.EndPosition.X, last.EndPosition.Y, LegacyButtonState.None));
-                        if (!(h is Spinner)) addFrameToReplay(new LegacyReplayFrame(h.StartTime - h.HitWindowFor(OsuScoreResult.Hit50), h.Position.X, h.Position.Y, LegacyButtonState.None));
+                        if (!(last is Spinner) && h.StartTime - endTime < 1000) addFrameToReplay(new ReplayFrame(endTime + h.HitWindowFor(OsuScoreResult.Hit50), last.EndPosition.X, last.EndPosition.Y, ReplayButtonState.None));
+                        if (!(h is Spinner)) addFrameToReplay(new ReplayFrame(h.StartTime - h.HitWindowFor(OsuScoreResult.Hit50), h.Position.X, h.Position.Y, ReplayButtonState.None));
                     }
                     else if (h.StartTime - h.HitWindowFor(OsuScoreResult.Hit100) > endTime + h.HitWindowFor(OsuScoreResult.Hit100) + 50)
                     {
-                        if (!(last is Spinner) && h.StartTime - endTime < 1000) addFrameToReplay(new LegacyReplayFrame(endTime + h.HitWindowFor(OsuScoreResult.Hit100), last.EndPosition.X, last.EndPosition.Y, LegacyButtonState.None));
-                        if (!(h is Spinner)) addFrameToReplay(new LegacyReplayFrame(h.StartTime - h.HitWindowFor(OsuScoreResult.Hit100), h.Position.X, h.Position.Y, LegacyButtonState.None));
+                        if (!(last is Spinner) && h.StartTime - endTime < 1000) addFrameToReplay(new ReplayFrame(endTime + h.HitWindowFor(OsuScoreResult.Hit100), last.EndPosition.X, last.EndPosition.Y, ReplayButtonState.None));
+                        if (!(h is Spinner)) addFrameToReplay(new ReplayFrame(h.StartTime - h.HitWindowFor(OsuScoreResult.Hit100), h.Position.X, h.Position.Y, ReplayButtonState.None));
                     }
                 }
 
@@ -173,13 +177,13 @@ namespace osu.Game.Modes.Osu
                 // Do some nice easing for cursor movements
                 if (Frames.Count > 0)
                 {
-                    LegacyReplayFrame lastFrame = Frames[Frames.Count - 1];
+                    ReplayFrame lastFrame = Frames[Frames.Count - 1];
 
                     // Wait until Auto could "see and react" to the next note.
                     double waitTime = h.StartTime - Math.Max(0.0, DrawableOsuHitObject.TIME_PREEMPT - reactionTime);
                     if (waitTime > lastFrame.Time)
                     {
-                        lastFrame = new LegacyReplayFrame(waitTime, lastFrame.MouseX, lastFrame.MouseY, lastFrame.ButtonState);
+                        lastFrame = new ReplayFrame(waitTime, lastFrame.MouseX, lastFrame.MouseY, lastFrame.ButtonState);
                         addFrameToReplay(lastFrame);
                     }
 
@@ -196,7 +200,7 @@ namespace osu.Game.Modes.Osu
                         for (double time = lastFrame.Time + frameDelay; time < h.StartTime; time += frameDelay)
                         {
                             Vector2 currentPosition = Interpolation.ValueAt(time, lastPosition, targetPosition, lastFrame.Time, h.StartTime, easing);
-                            addFrameToReplay(new LegacyReplayFrame((int)time, currentPosition.X, currentPosition.Y, lastFrame.ButtonState));
+                            addFrameToReplay(new ReplayFrame((int)time, currentPosition.X, currentPosition.Y, lastFrame.ButtonState));
                         }
 
                         buttonIndex = 0;
@@ -207,12 +211,12 @@ namespace osu.Game.Modes.Osu
                     }
                 }
 
-                LegacyButtonState button = buttonIndex % 2 == 0 ? LegacyButtonState.Left1 : LegacyButtonState.Right1;
+                ReplayButtonState button = buttonIndex % 2 == 0 ? ReplayButtonState.Left1 : ReplayButtonState.Right1;
 
                 double hEndTime = (h as IHasEndTime)?.EndTime ?? h.StartTime;
 
-                LegacyReplayFrame newFrame = new LegacyReplayFrame(h.StartTime, targetPosition.X, targetPosition.Y, button);
-                LegacyReplayFrame endFrame = new LegacyReplayFrame(hEndTime + endDelay, h.EndPosition.X, h.EndPosition.Y, LegacyButtonState.None);
+                ReplayFrame newFrame = new ReplayFrame(h.StartTime, targetPosition.X, targetPosition.Y, button);
+                ReplayFrame endFrame = new ReplayFrame(hEndTime + endDelay, h.EndPosition.X, h.EndPosition.Y, ReplayButtonState.None);
 
                 // Decrement because we want the previous frame, not the next one
                 int index = findInsertionIndex(newFrame) - 1;
@@ -220,19 +224,19 @@ namespace osu.Game.Modes.Osu
                 // Do we have a previous frame? No need to check for < replay.Count since we decremented!
                 if (index >= 0)
                 {
-                    LegacyReplayFrame previousFrame = Frames[index];
+                    ReplayFrame previousFrame = Frames[index];
                     var previousButton = previousFrame.ButtonState;
 
                     // If a button is already held, then we simply alternate
-                    if (previousButton != LegacyButtonState.None)
+                    if (previousButton != ReplayButtonState.None)
                     {
-                        Debug.Assert(previousButton != (LegacyButtonState.Left1 | LegacyButtonState.Right1));
+                        Debug.Assert(previousButton != (ReplayButtonState.Left1 | ReplayButtonState.Right1));
 
                         // Force alternation if we have the same button. Otherwise we can just keep the naturally to us assigned button.
                         if (previousButton == button)
                         {
-                            button = (LegacyButtonState.Left1 | LegacyButtonState.Right1) & ~button;
-                            newFrame.SetButtonStates(button);
+                            button = (ReplayButtonState.Left1 | ReplayButtonState.Right1) & ~button;
+                            newFrame.ButtonState = button;
                         }
 
                         // We always follow the most recent slider / spinner, so remove any other frames that occur while it exists.
@@ -246,7 +250,7 @@ namespace osu.Game.Modes.Osu
                         {
                             // Don't affect frames which stop pressing a button!
                             if (j < Frames.Count - 1 || Frames[j].ButtonState == previousButton)
-                                Frames[j].SetButtonStates(button);
+                                Frames[j].ButtonState = button;
                         }
                     }
                 }
@@ -270,13 +274,13 @@ namespace osu.Game.Modes.Osu
                         t = applyModsToTime(j - h.StartTime) * spinnerDirection;
 
                         Vector2 pos = spinner_centre + circlePosition(t / 20 + angle, spin_radius);
-                        addFrameToReplay(new LegacyReplayFrame((int)j, pos.X, pos.Y, button));
+                        addFrameToReplay(new ReplayFrame((int)j, pos.X, pos.Y, button));
                     }
 
                     t = applyModsToTime(s.EndTime - h.StartTime) * spinnerDirection;
                     Vector2 endPosition = spinner_centre + circlePosition(t / 20 + angle, spin_radius);
 
-                    addFrameToReplay(new LegacyReplayFrame(s.EndTime, endPosition.X, endPosition.Y, button));
+                    addFrameToReplay(new ReplayFrame(s.EndTime, endPosition.X, endPosition.Y, button));
 
                     endFrame.MouseX = endPosition.X;
                     endFrame.MouseY = endPosition.Y;
@@ -288,10 +292,10 @@ namespace osu.Game.Modes.Osu
                     for (double j = frameDelay; j < s.Duration; j += frameDelay)
                     {
                         Vector2 pos = s.PositionAt(j / s.Duration);
-                        addFrameToReplay(new LegacyReplayFrame(h.StartTime + j, pos.X, pos.Y, button));
+                        addFrameToReplay(new ReplayFrame(h.StartTime + j, pos.X, pos.Y, button));
                     }
 
-                    addFrameToReplay(new LegacyReplayFrame(s.EndTime, s.EndPosition.X, s.EndPosition.Y, button));
+                    addFrameToReplay(new ReplayFrame(s.EndTime, s.EndPosition.X, s.EndPosition.Y, button));
                 }
 
                 // We only want to let go of our button if we are at the end of the current replay. Otherwise something is still going on after us so we need to keep the button pressed!

osu.Game.Modes.Osu/OsuKeyConversionInputManager.cs

@@ -42,14 +42,14 @@ namespace osu.Game.Modes.Osu
             {
                 if (mouseDisabled.Value)
                 {
-                    mouse.PressedButtons.Remove(MouseButton.Left);
-                    mouse.PressedButtons.Remove(MouseButton.Right);
+                    mouse.SetPressed(MouseButton.Left, false);
+                    mouse.SetPressed(MouseButton.Right, false);
                 }
 
                 if (leftViaKeyboard)
-                    mouse.PressedButtons.Add(MouseButton.Left);
+                    mouse.SetPressed(MouseButton.Left, true);
                 if (rightViaKeyboard)
-                    mouse.PressedButtons.Add(MouseButton.Right);
+                    mouse.SetPressed(MouseButton.Right, true);
             }
         }
     }

osu.Game.Modes.Osu/Properties/AssemblyInfo.cs

@@ -4,7 +4,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("osu.Game.Mode.Osu")]
@@ -16,8 +16,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
@@ -27,11 +27,11 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]

osu.Game.Modes.Osu/Scoring/OsuScoreProcessor.cs

@@ -28,7 +28,7 @@ namespace osu.Game.Modes.Osu.Scoring
             Accuracy.Value = 1;
         }
 
-        protected override void OnNewJugement(OsuJudgement judgement)
+        protected override void OnNewJudgement(OsuJudgement judgement)
         {
             if (judgement != null)
             {

osu.Game.Modes.Osu/UI/OsuHitRenderer.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using OpenTK;
 using osu.Game.Beatmaps;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Osu.Beatmaps;
@@ -46,5 +47,7 @@ namespace osu.Game.Modes.Osu.UI
                 return new DrawableSpinner(spinner);
             return null;
         }
+
+        protected override Vector2 GetPlayfieldAspectAdjust() => new Vector2(0.75f);
     }
 }

osu.Game.Modes.Osu/UI/OsuPlayfield.cs

@@ -21,6 +21,8 @@ namespace osu.Game.Modes.Osu.UI
         private readonly Container judgementLayer;
         private readonly ConnectionRenderer<OsuHitObject> connectionLayer;
 
+        public override bool ProvidingUserCursor => true;
+
         public override Vector2 Size
         {
             get
@@ -36,8 +38,6 @@ namespace osu.Game.Modes.Osu.UI
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
-            RelativeSizeAxes = Axes.Both;
-            Size = new Vector2(0.75f);
 
             Add(new Drawable[]
             {

osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapConverter.cs

@@ -2,81 +2,160 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Legacy;
-using osu.Game.Beatmaps.Samples;
 using osu.Game.Modes.Objects;
 using osu.Game.Modes.Objects.Types;
 using osu.Game.Modes.Taiko.Objects;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Game.Database;
+using osu.Game.IO.Serialization;
+using osu.Game.Audio;
 
 namespace osu.Game.Modes.Taiko.Beatmaps
 {
     internal class TaikoBeatmapConverter : IBeatmapConverter<TaikoHitObject>
     {
-        private const float legacy_velocity_scale = 1.4f;
-        private const float bash_convert_factor = 1.65f;
+        /// <summary>
+        /// osu! is generally slower than taiko, so a factor is added to increase
+        /// speed. This must be used everywhere slider length or beat length is used.
+        /// </summary>
+        private const float legacy_velocity_multiplier = 1.4f;
+
+        /// <summary>
+        /// Because swells are easier in taiko than spinners are in osu!,
+        /// legacy taiko multiplies a factor when converting the number of required hits.
+        /// </summary>
+        private const float swell_hit_multiplier = 1.65f;
+
+        /// <summary>
+        /// Base osu! slider scoring distance.
+        /// </summary>
+        private const float osu_base_scoring_distance = 100;
+
+        /// <summary>
+        /// Drum roll distance that results in a duration of 1 speed-adjusted beat length.
+        /// </summary>
+        private const float taiko_base_distance = 100;
 
         public Beatmap<TaikoHitObject> Convert(Beatmap original)
         {
-            if (original is LegacyBeatmap)
-                original.TimingInfo.ControlPoints.ForEach(c => c.VelocityAdjustment /= legacy_velocity_scale);
+            BeatmapInfo info = original.BeatmapInfo.DeepClone<BeatmapInfo>();
+            info.Difficulty.SliderMultiplier *= legacy_velocity_multiplier;
 
             return new Beatmap<TaikoHitObject>(original)
             {
-                HitObjects = convertHitObjects(original.HitObjects)
+                BeatmapInfo = info,
+                HitObjects = original.HitObjects.SelectMany(h => convertHitObject(h, original)).ToList()
             };
         }
 
-        private List<TaikoHitObject> convertHitObjects(List<HitObject> hitObjects)
-        {
-            return hitObjects.Select(convertHitObject).ToList();
-        }
-
-        private TaikoHitObject convertHitObject(HitObject original)
+        private IEnumerable<TaikoHitObject> convertHitObject(HitObject obj, Beatmap beatmap)
         {
             // Check if this HitObject is already a TaikoHitObject, and return it if so
-            TaikoHitObject originalTaiko = original as TaikoHitObject;
+            var originalTaiko = obj as TaikoHitObject;
             if (originalTaiko != null)
-                return originalTaiko;
+                yield return originalTaiko;
 
-            IHasDistance distanceData = original as IHasDistance;
-            IHasRepeats repeatsData = original as IHasRepeats;
-            IHasEndTime endTimeData = original as IHasEndTime;
+            var distanceData = obj as IHasDistance;
+            var repeatsData = obj as IHasRepeats;
+            var endTimeData = obj as IHasEndTime;
 
-            bool strong = ((original.Sample?.Type ?? SampleType.None) & SampleType.Finish) > 0;
+            // Old osu! used hit sounding to determine various hit type information
+            List<SampleInfo> samples = obj.Samples;
+
+            bool strong = samples.Any(s => s.Name == SampleInfo.HIT_FINISH);
 
             if (distanceData != null)
             {
-                return new DrumRoll
-                {
-                    StartTime = original.StartTime,
-                    Sample = original.Sample,
-                    IsStrong = strong,
+                int repeats = repeatsData?.RepeatCount ?? 1;
 
-                    Distance = distanceData.Distance * (repeatsData?.RepeatCount ?? 1)
+                double speedAdjustment = beatmap.TimingInfo.SpeedMultiplierAt(obj.StartTime);
+                double speedAdjustedBeatLength = beatmap.TimingInfo.BeatLengthAt(obj.StartTime) * speedAdjustment;
+
+                // The true distance, accounting for any repeats. This ends up being the drum roll distance later
+                double distance = distanceData.Distance * repeats * legacy_velocity_multiplier;
+
+                // The velocity of the taiko hit object - calculated as the velocity of a drum roll
+                double taikoVelocity = taiko_base_distance * beatmap.BeatmapInfo.Difficulty.SliderMultiplier * legacy_velocity_multiplier / speedAdjustedBeatLength;
+                // The duration of the taiko hit object
+                double taikoDuration = distance / taikoVelocity;
+
+                // For some reason, old osu! always uses speedAdjustment to determine the taiko velocity, but
+                // only uses it to determine osu! velocity if beatmap version < 8. Let's account for that here.
+                if (beatmap.BeatmapInfo.BeatmapVersion >= 8)
+                    speedAdjustedBeatLength /= speedAdjustment;
+
+                // The velocity of the osu! hit object - calculated as the velocity of a slider
+                double osuVelocity = osu_base_scoring_distance * beatmap.BeatmapInfo.Difficulty.SliderMultiplier * legacy_velocity_multiplier / speedAdjustedBeatLength;
+                // The duration of the osu! hit object
+                double osuDuration = distance / osuVelocity;
+
+                // If the drum roll is to be split into hit circles, assume the ticks are 1/8 spaced within the duration of one beat
+                double tickSpacing = Math.Min(speedAdjustedBeatLength / beatmap.BeatmapInfo.Difficulty.SliderTickRate, taikoDuration / repeats) / 8;
+
+                if (tickSpacing > 0 && osuDuration < 2 * speedAdjustedBeatLength)
+                {
+                    for (double j = obj.StartTime; j <= distanceData.EndTime + tickSpacing; j += tickSpacing)
+                    {
+                        // Todo: This should generate different type of hits (including strongs)
+                        // depending on hitobject sound additions (not implemented fully yet)
+                        yield return new CentreHit
+                        {
+                            StartTime = j,
+                            Samples = obj.Samples,
+                            IsStrong = strong,
+                        };
+                    }
+                }
+                else
+                {
+                    yield return new DrumRoll
+                    {
+                        StartTime = obj.StartTime,
+                        Samples = obj.Samples,
+                        IsStrong = strong,
+                        Duration = taikoDuration,
+                        TickRate = beatmap.BeatmapInfo.Difficulty.SliderTickRate == 3 ? 3 : 4,
+                    };
+                }
+            }
+            else if (endTimeData != null)
+            {
+                double hitMultiplier = BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.Difficulty.OverallDifficulty, 3, 5, 7.5) * swell_hit_multiplier;
+
+                yield return new Swell
+                {
+                    StartTime = obj.StartTime,
+                    Samples = obj.Samples,
+                    IsStrong = strong,
+                    Duration = endTimeData.Duration,
+                    RequiredHits = (int)Math.Max(1, endTimeData.Duration / 1000 * hitMultiplier),
                 };
             }
-
-            if (endTimeData != null)
+            else
             {
-                // We compute the end time manually to add in the Bash convert factor
-                return new Swell
+                bool isRim = samples.Any(s => s.Name == SampleInfo.HIT_CLAP || s.Name == SampleInfo.HIT_WHISTLE);
+
+                if (isRim)
                 {
-                    StartTime = original.StartTime,
-                    Sample = original.Sample,
-                    IsStrong = strong,
-
-                    EndTime = original.StartTime + endTimeData.Duration * bash_convert_factor 
-                };
+                    yield return new RimHit
+                    {
+                        StartTime = obj.StartTime,
+                        Samples = obj.Samples,
+                        IsStrong = strong,
+                    };
+                }
+                else
+                {
+                    yield return new CentreHit
+                    {
+                        StartTime = obj.StartTime,
+                        Samples = obj.Samples,
+                        IsStrong = strong,
+                    };
+                }
             }
-
-            return new Hit
-            {
-                StartTime = original.StartTime,
-                Sample = original.Sample,
-                IsStrong = strong
-            };
         }
     }
 }

osu.Game.Modes.Taiko/Judgements/TaikoDrumRollTickJudgement.cs

@@ -15,6 +15,8 @@ namespace osu.Game.Modes.Taiko.Judgements
         /// </summary>
         public override string MaxResultString => string.Empty;
 
+        public override bool AffectsCombo => false;
+
         protected override int NumericResultForScore(TaikoHitResult result)
         {
             switch (result)

osu.Game.Modes.Taiko/Judgements/TaikoJudgement.cs

@@ -3,6 +3,7 @@
 
 using osu.Game.Modes.Judgements;
 using osu.Framework.Extensions;
+using osu.Game.Modes.Objects.Drawables;
 
 namespace osu.Game.Modes.Taiko.Judgements
 {
@@ -21,18 +22,18 @@ namespace osu.Game.Modes.Taiko.Judgements
         /// <summary>
         /// The result value for the combo portion of the score.
         /// </summary>
-        public int ResultValueForScore => NumericResultForScore(TaikoResult);
-        
+        public int ResultValueForScore => Result == HitResult.Miss ? 0 : NumericResultForScore(TaikoResult);
+
         /// <summary>
         /// The result value for the accuracy portion of the score.
         /// </summary>
-        public int ResultValueForAccuracy => NumericResultForAccuracy(TaikoResult);
+        public int ResultValueForAccuracy => Result == HitResult.Miss ? 0 : NumericResultForAccuracy(TaikoResult);
 
         /// <summary>
         /// The maximum result value for the combo portion of the score.
         /// </summary>
         public int MaxResultValueForScore => NumericResultForScore(MAX_HIT_RESULT);
-        
+
         /// <summary>
         /// The maximum result value for the accuracy portion of the score.
         /// </summary>
@@ -43,9 +44,9 @@ namespace osu.Game.Modes.Taiko.Judgements
         public override string MaxResultString => MAX_HIT_RESULT.GetDescription();
 
         /// <summary>
-        /// Whether this Judgement has a secondary hit in the case of finishers.
+        /// Whether this Judgement has a secondary hit in the case of strong hits.
         /// </summary>
-        public bool SecondHit;
+        public virtual bool SecondHit { get; set; }
 
         /// <summary>
         /// Computes the numeric result value for the combo portion of the score.

osu.Game.Modes.Taiko/Judgements/TaikoStrongHitJudgement.cs

@@ -0,0 +1,25 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Modes.Judgements;
+
+namespace osu.Game.Modes.Taiko.Judgements
+{
+    public class TaikoStrongHitJudgement : TaikoJudgement, IPartialJudgement
+    {
+        public bool Changed { get; set; }
+
+        public override bool SecondHit
+        {
+            get { return base.SecondHit; }
+            set
+            {
+                if (base.SecondHit == value)
+                    return;
+                base.SecondHit = value;
+
+                Changed = true;
+            }
+        }
+    }
+}

osu.Game.Modes.Taiko/Mods/TaikoMod.cs

@@ -1,7 +1,12 @@
 // Copyright (c) 2007-2017 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.Modes.Mods;
+using osu.Game.Modes.Scoring;
+using osu.Game.Modes.Taiko.Objects;
+using osu.Game.Modes.Taiko.Replays;
+using osu.Game.Users;
 
 namespace osu.Game.Modes.Taiko.Mods
 {
@@ -61,4 +66,13 @@ namespace osu.Game.Modes.Taiko.Mods
     {
 
     }
+
+    public class TaikoModAutoplay : ModAutoplay<TaikoHitObject>
+    {
+        protected override Score CreateReplayScore(Beatmap<TaikoHitObject> beatmap) => new Score
+        {
+            User = new User { Username = "mekkadosu!" },
+            Replay = new TaikoAutoReplay(beatmap)
+        };
+    }
 }

osu.Game.Modes.Taiko/Objects/BarLine.cs

@@ -1,10 +1,9 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-namespace osu.Game.Beatmaps.Samples
+namespace osu.Game.Modes.Taiko.Objects
 {
-    public class HitSampleInfo : SampleInfo
+    public class BarLine : TaikoHitObject
     {
-        public SampleType Type { get; set; }
     }
 }

osu.Game.Modes.Taiko/Objects/CentreHit.cs

@@ -1,11 +1,9 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-namespace osu.Game.Beatmaps.Samples
+namespace osu.Game.Modes.Taiko.Objects
 {
-    public class SampleInfo
+    public class CentreHit : Hit
     {
-        public SampleBank Bank;
-        public SampleSet Set;
     }
 }

osu.Game.Modes.Taiko/Objects/Drawable/DrawableDrumRoll.cs

@@ -1,57 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Game.Modes.Objects.Drawables;
-using osu.Game.Modes.Taiko.Judgements;
-using System.Linq;
-
-namespace osu.Game.Modes.Taiko.Objects.Drawable
-{
-    public class DrawableDrumRoll : DrawableTaikoHitObject
-    {
-        private readonly DrumRoll drumRoll;
-
-        public DrawableDrumRoll(DrumRoll drumRoll)
-            : base(drumRoll)
-        {
-            this.drumRoll = drumRoll;
-
-            int tickIndex = 0;
-            foreach (var tick in drumRoll.Ticks)
-            {
-                var newTick = new DrawableDrumRollTick(tick)
-                {
-                    Depth = tickIndex,
-                    X = (float)((tick.StartTime - HitObject.StartTime) / drumRoll.Duration)
-                };
-
-                AddNested(newTick);
-
-                tickIndex++;
-            }
-        }
-
-        protected override void UpdateState(ArmedState state)
-        {
-        }
-
-        protected override void CheckJudgement(bool userTriggered)
-        {
-            if (userTriggered)
-                return;
-
-            if (Judgement.TimeOffset < 0)
-                return;
-
-            int countHit = NestedHitObjects.Count(o => o.Judgement.Result == HitResult.Hit);
-
-            if (countHit > drumRoll.RequiredGoodHits)
-            {
-                Judgement.Result = HitResult.Hit;
-                Judgement.TaikoResult = countHit >= drumRoll.RequiredGreatHits ? TaikoHitResult.Great : TaikoHitResult.Good;
-            }
-            else
-                Judgement.Result = HitResult.Miss;
-        }
-    }
-}

osu.Game.Modes.Taiko/Objects/Drawable/DrawableHit.cs

@@ -1,67 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using OpenTK.Input;
-using osu.Game.Modes.Objects.Drawables;
-using osu.Game.Modes.Taiko.Judgements;
-using System;
-using System.Collections.Generic;
-
-namespace osu.Game.Modes.Taiko.Objects.Drawable
-{
-    public abstract class DrawableHit : DrawableTaikoHitObject
-    {
-        /// <summary>
-        /// A list of keys which can result in hits for this HitObject.
-        /// </summary>
-        protected abstract List<Key> HitKeys { get; }
-
-        private readonly Hit hit;
-
-        /// <summary>
-        /// Whether the last key pressed is a valid hit key.
-        /// </summary>
-        private bool validKeyPressed;
-
-        protected DrawableHit(Hit hit)
-            : base(hit)
-        {
-            this.hit = hit;
-        }
-
-        protected override void CheckJudgement(bool userTriggered)
-        {
-            if (!userTriggered)
-            {
-                if (Judgement.TimeOffset > hit.HitWindowGood)
-                    Judgement.Result = HitResult.Miss;
-                return;
-            }
-
-            double hitOffset = Math.Abs(Judgement.TimeOffset);
-
-            if (hitOffset > hit.HitWindowMiss)
-                return;
-
-            if (!validKeyPressed)
-                Judgement.Result = HitResult.Miss;
-            else if (hitOffset < hit.HitWindowGood)
-            {
-                Judgement.Result = HitResult.Hit;
-                Judgement.TaikoResult = hitOffset < hit.HitWindowGreat ? TaikoHitResult.Great : TaikoHitResult.Good;
-            }
-            else
-                Judgement.Result = HitResult.Miss;
-        }
-
-        protected override bool HandleKeyPress(Key key)
-        {
-            if (Judgement.Result.HasValue)
-                return false;
-
-            validKeyPressed = HitKeys.Contains(key);
-
-            return UpdateJudgement(true);
-        }
-    }
-}

osu.Game.Modes.Taiko/Objects/Drawable/DrawableSwell.cs

@@ -1,75 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using OpenTK.Input;
-using osu.Game.Modes.Objects.Drawables;
-using osu.Game.Modes.Taiko.Judgements;
-using System;
-
-namespace osu.Game.Modes.Taiko.Objects.Drawable
-{
-    public class DrawableSwell : DrawableTaikoHitObject
-    {
-        /// <summary>
-        /// The amount of times the user has hit this swell.
-        /// </summary>
-        private int userHits;
-
-        private readonly Swell swell;
-
-        public DrawableSwell(Swell swell)
-            : base(swell)
-        {
-            this.swell = swell;
-        }
-
-        protected override void CheckJudgement(bool userTriggered)
-        {
-            if (userTriggered)
-            {
-                if (Time.Current < HitObject.StartTime)
-                    return;
-
-                userHits++;
-
-                if (userHits == swell.RequiredHits)
-                {
-                    Judgement.Result = HitResult.Hit;
-                    Judgement.TaikoResult = TaikoHitResult.Great;
-                }
-            }
-            else
-            {
-                if (Judgement.TimeOffset < 0)
-                    return;
-
-                if (userHits > swell.RequiredHits / 2)
-                {
-                    Judgement.Result = HitResult.Hit;
-                    Judgement.TaikoResult = TaikoHitResult.Good;
-                }
-                else
-                    Judgement.Result = HitResult.Miss;
-            }
-        }
-
-        protected override void UpdateState(ArmedState state)
-        {
-        }
-
-        protected override void UpdateScrollPosition(double time)
-        {
-            base.UpdateScrollPosition(Math.Min(time, HitObject.StartTime));
-        }
-
-        protected override bool HandleKeyPress(Key key)
-        {
-            if (Judgement.Result.HasValue)
-                return false;
-
-            UpdateJudgement(true);
-
-            return true;
-        }
-    }
-}

osu.Game.Modes.Taiko/Objects/Drawable/Pieces/CirclePiece.cs

@@ -1,160 +0,0 @@
-// Copyright (c) 2007-2017 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 osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
-using osu.Game.Graphics.Backgrounds;
-using OpenTK.Graphics;
-using System;
-
-namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces
-{
-    /// <summary>
-    /// A circle piece which is used uniformly through osu!taiko to visualise hitobjects.
-    /// <para>
-    /// The body of this piece will overshoot its parent by <see cref="CirclePiece.Height"/> to form 
-    /// a rounded (_[-Width-]_) figure such that a regular "circle" is the result of a parent with Width = 0.
-    /// </para>
-    /// </summary>
-    public class CirclePiece : Container
-    {
-        public const float SYMBOL_SIZE = TaikoHitObject.CIRCLE_RADIUS * 2f * 0.45f;
-        public const float SYMBOL_BORDER = 8;
-        public const float SYMBOL_INNER_SIZE = SYMBOL_SIZE - 2 * SYMBOL_BORDER;
-
-        private Color4 accentColour;
-        /// <summary>
-        /// The colour of the inner circle and outer glows.
-        /// </summary>
-        public Color4 AccentColour
-        {
-            get { return accentColour; }
-            set
-            {
-                accentColour = value;
-
-                innerBackground.Colour = AccentColour;
-
-                triangles.ColourLight = AccentColour;
-                triangles.ColourDark = AccentColour.Darken(0.1f);
-
-                resetEdgeEffects();
-            }
-        }
-
-        private bool kiaiMode;
-        /// <summary>
-        /// Whether Kiai mode effects are enabled for this circle piece.
-        /// </summary>
-        public bool KiaiMode
-        {
-            get { return kiaiMode; }
-            set
-            {
-                kiaiMode = value;
-
-                resetEdgeEffects();
-            }
-        }
-
-        public override Anchor Origin
-        {
-            get { return Anchor.CentreLeft; }
-            set { throw new InvalidOperationException($"{nameof(CirclePiece)} must always use CentreLeft origin."); }
-        }
-
-        protected override Container<Framework.Graphics.Drawable> Content => SymbolContainer;
-        protected readonly Container SymbolContainer;
-
-        private readonly Container innerLayer;
-        private readonly Container innerCircleContainer;
-        private readonly Box innerBackground;
-        private readonly Triangles triangles;
-
-        public CirclePiece()
-        {
-            RelativeSizeAxes = Axes.X;
-            Height = TaikoHitObject.CIRCLE_RADIUS * 2;
-
-            // The "inner layer" is the body of the CirclePiece that overshoots it by Height/2 px on both sides
-            AddInternal(innerLayer = new Container
-            {
-                Name = "Inner Layer",
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                RelativeSizeAxes = Axes.Y,
-                Children = new Framework.Graphics.Drawable[]
-                {
-                    innerCircleContainer = new CircularContainer
-                    {
-                        Name = "Inner Circle",
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        RelativeSizeAxes = Axes.Both,
-                        Masking = true,
-                        Children = new Framework.Graphics.Drawable[]
-                        {
-                            innerBackground = new Box
-                            {
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                RelativeSizeAxes = Axes.Both,
-                            },
-                            triangles = new Triangles
-                            {
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                RelativeSizeAxes = Axes.Both,
-                            }
-                        }
-                    },
-                    new CircularContainer
-                    {
-                        Name = "Ring",
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        RelativeSizeAxes = Axes.Both,
-                        BorderThickness = 8,
-                        BorderColour = Color4.White,
-                        Masking = true,
-                        Children = new[]
-                        {
-                            new Box
-                            {
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                RelativeSizeAxes = Axes.Both,
-                                Alpha = 0,
-                                AlwaysPresent = true
-                            }
-                        }
-                    },
-                    SymbolContainer = new Container
-                    {
-                        Name = "Symbol",
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                    }
-                }
-            });
-        }
-
-        protected override void Update()
-        {
-            // Add the overshoot to compensate for corner radius
-            innerLayer.Width = DrawWidth + DrawHeight;
-        }
-
-        private void resetEdgeEffects()
-        {
-            innerCircleContainer.EdgeEffect = new EdgeEffect
-            {
-                Type = EdgeEffectType.Glow,
-                Colour = AccentColour,
-                Radius = KiaiMode ? 50 : 8
-            };
-        }
-    }
-}

osu.Game.Modes.Taiko/Objects/Drawable/Pieces/StrongCirclePiece.cs

@@ -1,25 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using OpenTK;
-
-namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces
-{
-    /// <summary>
-    /// A type of circle piece which is drawn at a higher scale to represent a "strong" piece.
-    /// </summary>
-    public class StrongCirclePiece : CirclePiece
-    {
-        /// <summary>
-        /// The amount to scale up the base circle to show it as a "strong" piece.
-        /// </summary>
-        private const float strong_scale = 1.5f;
-
-        public StrongCirclePiece()
-        {
-            SymbolContainer.Scale = new Vector2(strong_scale);
-        }
-
-        public override Vector2 Size => new Vector2(base.Size.X, base.Size.Y * strong_scale);
-    }
-}

osu.Game.Modes.Taiko/Objects/Drawables/DrawableBarLine.cs

@@ -0,0 +1,80 @@
+// Copyright (c) 2007-2017 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.Graphics.Sprites;
+using OpenTK;
+
+namespace osu.Game.Modes.Taiko.Objects.Drawables
+{
+    /// <summary>
+    /// A line that scrolls alongside hit objects in the playfield and visualises control points.
+    /// </summary>
+    public class DrawableBarLine : Container
+    {
+        /// <summary>
+        /// The width of the line tracker.
+        /// </summary>
+        private const float tracker_width = 2f;
+
+        /// <summary>
+        /// Fade out time calibrated to a pre-empt of 1000ms.
+        /// </summary>
+        private const float base_fadeout_time = 100f;
+
+        /// <summary>
+        /// The visual line tracker.
+        /// </summary>
+        protected Box Tracker;
+
+        /// <summary>
+        /// The bar line.
+        /// </summary>
+        protected readonly BarLine BarLine;
+
+        public DrawableBarLine(BarLine barLine)
+        {
+            BarLine = barLine;
+
+            Anchor = Anchor.CentreLeft;
+            Origin = Anchor.Centre;
+
+            RelativePositionAxes = Axes.X;
+            RelativeSizeAxes = Axes.Y;
+
+            Width = tracker_width;
+
+            Children = new[]
+            {
+                Tracker = new Box
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    EdgeSmoothness = new Vector2(0.5f, 0),
+                    Alpha = 0.75f
+                }
+            };
+
+            LifetimeStart = BarLine.StartTime - BarLine.ScrollTime * 2;
+            LifetimeEnd = BarLine.StartTime + BarLine.ScrollTime;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Delay(BarLine.StartTime - Time.Current);
+            FadeOut(base_fadeout_time * BarLine.ScrollTime / 1000);
+        }
+
+        private void updateScrollPosition(double time) => MoveToX((float)((BarLine.StartTime - time) / BarLine.ScrollTime));
+
+        protected override void Update()
+        {
+            base.Update();
+
+            updateScrollPosition(Time.Current);
+        }
+    }
+}

osu.Game.Modes.Taiko/Objects/Drawables/DrawableBarLineMajor.cs

@@ -0,0 +1,57 @@
+// Copyright (c) 2007-2017 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.Graphics.Sprites;
+using OpenTK;
+
+namespace osu.Game.Modes.Taiko.Objects.Drawables
+{
+    public class DrawableBarLineMajor : DrawableBarLine
+    {
+        /// <summary>
+        /// The vertical offset of the triangles from the line tracker.
+        /// </summary>
+        private const float triangle_offfset = 10f;
+
+        /// <summary>
+        /// The size of the triangles.
+        /// </summary>
+        private const float triangle_size = 20f;
+
+        public DrawableBarLineMajor(BarLine barLine)
+            : base(barLine)
+        {
+            Add(new Container
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.Both,
+                Children = new[]
+                {
+                    new EquilateralTriangle
+                    {
+                        Name = "Top",
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        Position = new Vector2(0, -triangle_offfset),
+                        Size = new Vector2(-triangle_size),
+                        EdgeSmoothness = new Vector2(1),
+                    },
+                    new EquilateralTriangle
+                    {
+                        Name = "Bottom",
+                        Anchor = Anchor.BottomCentre,
+                        Origin = Anchor.TopCentre,
+                        Position = new Vector2(0, triangle_offfset),
+                        Size = new Vector2(triangle_size),
+                        EdgeSmoothness = new Vector2(1),
+                    }
+                }
+            });
+
+            Tracker.Alpha = 1f;
+        }
+    }
+}

osu.Game.Modes.Taiko/Objects/Drawables/DrawableCentreHit.cs

@@ -0,0 +1,27 @@
+// Copyright (c) 2007-2017 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.Game.Graphics;
+using osu.Game.Modes.Taiko.Objects.Drawables.Pieces;
+using OpenTK.Input;
+
+namespace osu.Game.Modes.Taiko.Objects.Drawables
+{
+    public class DrawableCentreHit : DrawableHit
+    {
+        protected override Key[] HitKeys { get; } = { Key.F, Key.J };
+
+        public DrawableCentreHit(Hit hit)
+            : base(hit)
+        {
+            MainPiece.Add(new CentreHitSymbolPiece());
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            MainPiece.AccentColour = colours.PinkDarker;
+        }
+    }
+}

osu.Game.Modes.Taiko/Objects/Drawables/DrawableCentreHitStrong.cs

@@ -0,0 +1,27 @@
+// Copyright (c) 2007-2017 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.Game.Graphics;
+using osu.Game.Modes.Taiko.Objects.Drawables.Pieces;
+using OpenTK.Input;
+
+namespace osu.Game.Modes.Taiko.Objects.Drawables
+{
+    public class DrawableCentreHitStrong : DrawableHitStrong
+    {
+        protected override Key[] HitKeys { get; } = { Key.F, Key.J };
+
+        public DrawableCentreHitStrong(Hit hit)
+            : base(hit)
+        {
+            MainPiece.Add(new CentreHitSymbolPiece());
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            MainPiece.AccentColour = colours.PinkDarker;
+        }
+    }
+}

osu.Game.Modes.Taiko/Objects/Drawables/DrawableDrumRoll.cs

@@ -0,0 +1,109 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.MathUtils;
+using osu.Game.Graphics;
+using osu.Game.Modes.Objects.Drawables;
+using osu.Game.Modes.Taiko.Judgements;
+using OpenTK;
+using OpenTK.Graphics;
+using osu.Game.Modes.Taiko.Objects.Drawables.Pieces;
+
+namespace osu.Game.Modes.Taiko.Objects.Drawables
+{
+    public class DrawableDrumRoll : DrawableTaikoHitObject<DrumRoll>
+    {
+        /// <summary>
+        /// Number of rolling hits required to reach the dark/final accent colour.
+        /// </summary>
+        private const int rolling_hits_for_dark_accent = 5;
+
+        private Color4 accentDarkColour;
+
+        /// <summary>
+        /// Rolling number of tick hits. This increases for hits and decreases for misses.
+        /// </summary>
+        private int rollingHits;
+
+        public DrawableDrumRoll(DrumRoll drumRoll)
+            : base(drumRoll)
+        {
+            foreach (var tick in drumRoll.Ticks)
+            {
+                var newTick = new DrawableDrumRollTick(tick)
+                {
+                    X = (float)((tick.StartTime - HitObject.StartTime) / HitObject.Duration)
+                };
+
+                newTick.OnJudgement += onTickJudgement;
+
+                AddNested(newTick);
+                MainPiece.Add(newTick);
+            }
+        }
+
+        protected override TaikoJudgement CreateJudgement() => new TaikoJudgement { SecondHit = HitObject.IsStrong };
+
+        protected override TaikoPiece CreateMainPiece() => new ElongatedCirclePiece(HitObject.IsStrong)
+        {
+            Length = (float)(HitObject.Duration / HitObject.ScrollTime),
+            PlayfieldLengthReference = () => Parent.DrawSize.X
+        };
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            MainPiece.AccentColour = AccentColour = colours.YellowDark;
+            accentDarkColour = colours.YellowDarker;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            // This is naive, however it's based on the reasoning that the hit target
+            // is further than mid point of the play field, so the time taken to scroll in should always
+            // be greater than the time taken to scroll out to the left of the screen.
+            // Thus, using PreEmpt here is enough for the drum roll to completely scroll out.
+            LifetimeEnd = HitObject.EndTime + HitObject.ScrollTime;
+        }
+
+        private void onTickJudgement(DrawableHitObject<TaikoHitObject, TaikoJudgement> obj)
+        {
+            if (obj.Judgement.Result == HitResult.Hit)
+                rollingHits++;
+            else
+                rollingHits--;
+
+            rollingHits = MathHelper.Clamp(rollingHits, 0, rolling_hits_for_dark_accent);
+
+            Color4 newAccent = Interpolation.ValueAt((float)rollingHits / rolling_hits_for_dark_accent, AccentColour, accentDarkColour, 0, 1);
+            MainPiece.FadeAccent(newAccent, 100);
+        }
+
+        protected override void CheckJudgement(bool userTriggered)
+        {
+            if (userTriggered)
+                return;
+
+            if (Judgement.TimeOffset < 0)
+                return;
+
+            int countHit = NestedHitObjects.Count(o => o.Judgement.Result == HitResult.Hit);
+
+            if (countHit > HitObject.RequiredGoodHits)
+            {
+                Judgement.Result = HitResult.Hit;
+                Judgement.TaikoResult = countHit >= HitObject.RequiredGreatHits ? TaikoHitResult.Great : TaikoHitResult.Good;
+            }
+            else
+                Judgement.Result = HitResult.Miss;
+        }
+
+        protected override void UpdateState(ArmedState state)
+        {
+        }
+    }
+}

osu.Game.Modes.Taiko/Objects/Drawables/DrawableDrumRollTick.cs

@@ -1,35 +1,39 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK.Input;
-using osu.Game.Modes.Taiko.Judgements;
 using System;
+using osu.Framework.Graphics;
 using osu.Game.Modes.Objects.Drawables;
+using osu.Game.Modes.Taiko.Judgements;
+using OpenTK.Input;
+using osu.Game.Modes.Taiko.Objects.Drawables.Pieces;
 
-namespace osu.Game.Modes.Taiko.Objects.Drawable
+namespace osu.Game.Modes.Taiko.Objects.Drawables
 {
-    public class DrawableDrumRollTick : DrawableTaikoHitObject
+    public class DrawableDrumRollTick : DrawableTaikoHitObject<DrumRollTick>
     {
-        private readonly DrumRollTick tick;
-
         public DrawableDrumRollTick(DrumRollTick tick)
             : base(tick)
         {
-            this.tick = tick;
         }
 
-        protected override TaikoJudgement CreateJudgement() => new TaikoDrumRollTickJudgement();
+        protected override TaikoPiece CreateMainPiece() => new TickPiece
+        {
+            Filled = HitObject.FirstTick
+        };
+
+        protected override TaikoJudgement CreateJudgement() => new TaikoDrumRollTickJudgement { SecondHit = HitObject.IsStrong };
 
         protected override void CheckJudgement(bool userTriggered)
         {
             if (!userTriggered)
             {
-                if (Judgement.TimeOffset > tick.HitWindow)
+                if (Judgement.TimeOffset > HitObject.HitWindow)
                     Judgement.Result = HitResult.Miss;
                 return;
             }
 
-            if (Math.Abs(Judgement.TimeOffset) < tick.HitWindow)
+            if (Math.Abs(Judgement.TimeOffset) < HitObject.HitWindow)
             {
                 Judgement.Result = HitResult.Hit;
                 Judgement.TaikoResult = TaikoHitResult.Great;
@@ -38,16 +42,22 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
 
         protected override void UpdateState(ArmedState state)
         {
+            switch (state)
+            {
+                case ArmedState.Hit:
+                    Content.ScaleTo(0, 100, EasingTypes.OutQuint);
+                    break;
+            }
         }
 
         protected override void UpdateScrollPosition(double time)
         {
-            // Drum roll ticks shouldn't move
+            // Ticks don't move
         }
 
         protected override bool HandleKeyPress(Key key)
         {
-            return !Judgement.Result.HasValue && UpdateJudgement(true);
+            return Judgement.Result == HitResult.None && UpdateJudgement(true);
         }
     }
 }

osu.Game.Modes.Taiko/Objects/Drawables/DrawableHit.cs

@@ -0,0 +1,109 @@
+// Copyright (c) 2007-2017 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.Framework.Graphics;
+using osu.Game.Modes.Objects.Drawables;
+using osu.Game.Modes.Taiko.Judgements;
+using osu.Game.Modes.Taiko.Objects.Drawables.Pieces;
+using OpenTK.Input;
+
+namespace osu.Game.Modes.Taiko.Objects.Drawables
+{
+    public abstract class DrawableHit : DrawableTaikoHitObject<Hit>
+    {
+        /// <summary>
+        /// A list of keys which can result in hits for this HitObject.
+        /// </summary>
+        protected abstract Key[] HitKeys { get; }
+
+        /// <summary>
+        /// Whether the last key pressed is a valid hit key.
+        /// </summary>
+        private bool validKeyPressed;
+
+        protected DrawableHit(Hit hit)
+            : base(hit)
+        {
+        }
+
+        protected override void CheckJudgement(bool userTriggered)
+        {
+            if (!userTriggered)
+            {
+                if (Judgement.TimeOffset > HitObject.HitWindowGood)
+                    Judgement.Result = HitResult.Miss;
+                return;
+            }
+
+            double hitOffset = Math.Abs(Judgement.TimeOffset);
+
+            if (hitOffset > HitObject.HitWindowMiss)
+                return;
+
+            if (!validKeyPressed)
+                Judgement.Result = HitResult.Miss;
+            else if (hitOffset < HitObject.HitWindowGood)
+            {
+                Judgement.Result = HitResult.Hit;
+                Judgement.TaikoResult = hitOffset < HitObject.HitWindowGreat ? TaikoHitResult.Great : TaikoHitResult.Good;
+            }
+            else
+                Judgement.Result = HitResult.Miss;
+        }
+
+        protected override bool HandleKeyPress(Key key)
+        {
+            if (Judgement.Result != HitResult.None)
+                return false;
+
+            validKeyPressed = HitKeys.Contains(key);
+
+            return UpdateJudgement(true);
+        }
+
+        protected override void UpdateState(ArmedState state)
+        {
+            Delay(HitObject.StartTime - Time.Current + Judgement.TimeOffset, true);
+
+            var circlePiece = MainPiece as CirclePiece;
+
+            circlePiece?.FlashBox.Flush();
+
+            switch (State)
+            {
+                case ArmedState.Idle:
+                    Delay(HitObject.HitWindowMiss);
+                    break;
+                case ArmedState.Miss:
+                    FadeOut(100);
+                    break;
+                case ArmedState.Hit:
+                    FadeOut(600);
+
+                    var flash = circlePiece?.FlashBox;
+                    if (flash != null)
+                    {
+                        flash.FadeTo(0.9f);
+                        flash.FadeOut(300);
+                    }
+
+
+                    FadeOut(800);
+
+                    const float gravity_time = 300;
+                    const float gravity_travel_height = 200;
+
+                    Content.ScaleTo(0.8f, gravity_time * 2, EasingTypes.OutQuad);
+
+                    MoveToY(-gravity_travel_height, gravity_time, EasingTypes.Out);
+                    Delay(gravity_time, true);
+                    MoveToY(gravity_travel_height * 2, gravity_time * 2, EasingTypes.In);
+                    break;
+            }
+
+            Expire();
+        }
+    }
+}

osu.Game.Modes.Taiko/Objects/Drawables/DrawableHitStrong.cs

@@ -1,14 +1,17 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK.Input;
 using System;
 using System.Linq;
 using osu.Framework.Input;
+using osu.Game.Modes.Objects.Drawables;
+using osu.Game.Modes.Taiko.Judgements;
+using OpenTK.Input;
+using osu.Game.Modes.Taiko.Objects.Drawables.Pieces;
 
-namespace osu.Game.Modes.Taiko.Objects.Drawable
+namespace osu.Game.Modes.Taiko.Objects.Drawables
 {
-    public abstract class DrawableStrongHit : DrawableHit
+    public abstract class DrawableHitStrong : DrawableHit
     {
         /// <summary>
         /// The lenience for the second key press.
@@ -20,14 +23,18 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
         private bool firstKeyHeld;
         private Key firstHitKey;
 
-        protected DrawableStrongHit(Hit hit)
+        protected DrawableHitStrong(Hit hit)
             : base(hit)
         {
         }
 
+        protected override TaikoPiece CreateMainPiece() => new CirclePiece(true);
+
+        protected override TaikoJudgement CreateJudgement() => new TaikoStrongHitJudgement();
+
         protected override void CheckJudgement(bool userTriggered)
         {
-            if (!Judgement.Result.HasValue)
+            if (Judgement.Result == HitResult.None)
             {
                 base.CheckJudgement(userTriggered);
                 return;
@@ -45,7 +52,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
         protected override bool HandleKeyPress(Key key)
         {
             // Check if we've handled the first key
-            if (!Judgement.Result.HasValue)
+            if (Judgement.Result == HitResult.None)
             {
                 // First key hasn't been handled yet, attempt to handle it
                 bool handled = base.HandleKeyPress(key);

osu.Game.Modes.Taiko/Objects/Drawables/DrawableRimHit.cs

@@ -0,0 +1,27 @@
+// Copyright (c) 2007-2017 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.Game.Graphics;
+using osu.Game.Modes.Taiko.Objects.Drawables.Pieces;
+using OpenTK.Input;
+
+namespace osu.Game.Modes.Taiko.Objects.Drawables
+{
+    public class DrawableRimHit : DrawableHit
+    {
+        protected override Key[] HitKeys { get; } = { Key.D, Key.K };
+
+        public DrawableRimHit(Hit hit)
+            : base(hit)
+        {
+            MainPiece.Add(new RimHitSymbolPiece());
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            MainPiece.AccentColour = colours.BlueDarker;
+        }
+    }
+}

osu.Game.Modes.Taiko/Objects/Drawables/DrawableRimHitStrong.cs

@@ -0,0 +1,27 @@
+// Copyright (c) 2007-2017 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.Game.Graphics;
+using osu.Game.Modes.Taiko.Objects.Drawables.Pieces;
+using OpenTK.Input;
+
+namespace osu.Game.Modes.Taiko.Objects.Drawables
+{
+    public class DrawableRimHitStrong : DrawableHitStrong
+    {
+        protected override Key[] HitKeys { get; } = { Key.D, Key.K };
+
+        public DrawableRimHitStrong(Hit hit)
+            : base(hit)
+        {
+            MainPiece.Add(new RimHitSymbolPiece());
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            MainPiece.AccentColour = colours.BlueDarker;
+        }
+    }
+}

osu.Game.Modes.Taiko/Objects/Drawables/DrawableSwell.cs

@@ -0,0 +1,243 @@
+// Copyright (c) 2007-2017 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.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
+using osu.Game.Modes.Objects.Drawables;
+using osu.Game.Modes.Taiko.Judgements;
+using osu.Game.Modes.Taiko.Objects.Drawables.Pieces;
+using OpenTK;
+using OpenTK.Graphics;
+using OpenTK.Input;
+
+namespace osu.Game.Modes.Taiko.Objects.Drawables
+{
+    public class DrawableSwell : DrawableTaikoHitObject<Swell>
+    {
+        /// <summary>
+        /// Invoked when the swell has reached the hit target, i.e. when CurrentTime >= StartTime.
+        /// This is only ever invoked once.
+        /// </summary>
+        public event Action OnStart;
+
+        private const float target_ring_thick_border = 1.4f;
+        private const float target_ring_thin_border = 1f;
+        private const float target_ring_scale = 5f;
+        private const float inner_ring_alpha = 0.65f;
+
+        private readonly Container bodyContainer;
+        private readonly CircularContainer targetRing;
+        private readonly CircularContainer expandingRing;
+
+        private readonly CirclePiece circlePiece;
+
+        private readonly Key[] rimKeys = { Key.D, Key.K };
+        private readonly Key[] centreKeys = { Key.F, Key.J };
+        private Key[] lastKeySet;
+
+        /// <summary>
+        /// The amount of times the user has hit this swell.
+        /// </summary>
+        private int userHits;
+
+        private bool hasStarted;
+        private readonly SwellSymbolPiece symbol;
+
+        public DrawableSwell(Swell swell)
+            : base(swell)
+        {
+            Children = new Drawable[]
+            {
+                bodyContainer = new Container
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        expandingRing = new CircularContainer
+                        {
+                            Name = "Expanding ring",
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Alpha = 0,
+                            Size = new Vector2(TaikoHitObject.DEFAULT_CIRCLE_DIAMETER),
+                            BlendingMode = BlendingMode.Additive,
+                            Masking = true,
+                            Children = new []
+                            {
+                                new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Alpha = inner_ring_alpha,
+                                }
+                            }
+                        },
+                        targetRing = new CircularContainer
+                        {
+                            Name = "Target ring (thick border)",
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Size = new Vector2(TaikoHitObject.DEFAULT_CIRCLE_DIAMETER),
+                            Masking = true,
+                            BorderThickness = target_ring_thick_border,
+                            BlendingMode = BlendingMode.Additive,
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Alpha = 0,
+                                    AlwaysPresent = true
+                                },
+                                new CircularContainer
+                                {
+                                    Name = "Target ring (thin border)",
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    RelativeSizeAxes = Axes.Both,
+                                    Masking = true,
+                                    BorderThickness = target_ring_thin_border,
+                                    BorderColour = Color4.White,
+                                    Children = new[]
+                                    {
+                                        new Box
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Alpha = 0,
+                                            AlwaysPresent = true
+                                        }
+                                    }
+                                }
+                            }
+                        },
+                        circlePiece = new CirclePiece
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Children = new []
+                            {
+                                symbol = new SwellSymbolPiece()
+                            }
+                        }
+                    }
+                }
+            };
+
+            circlePiece.KiaiMode = HitObject.Kiai;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            circlePiece.AccentColour = colours.YellowDark;
+            expandingRing.Colour = colours.YellowLight;
+            targetRing.BorderColour = colours.YellowDark.Opacity(0.25f);
+        }
+
+        protected override void CheckJudgement(bool userTriggered)
+        {
+            if (userTriggered)
+            {
+                userHits++;
+
+                var completion = (float)userHits / HitObject.RequiredHits;
+
+                expandingRing.FadeTo(expandingRing.Alpha + MathHelper.Clamp(completion / 16, 0.1f, 0.6f), 50);
+                expandingRing.Delay(50);
+                expandingRing.FadeTo(completion / 8, 2000, EasingTypes.OutQuint);
+                expandingRing.DelayReset();
+
+                symbol.RotateTo((float)(completion * HitObject.Duration / 8), 4000, EasingTypes.OutQuint);
+
+                expandingRing.ScaleTo(1f + Math.Min(target_ring_scale - 1f, (target_ring_scale - 1f) * completion * 1.3f), 260, EasingTypes.OutQuint);
+
+                if (userHits == HitObject.RequiredHits)
+                {
+                    Judgement.Result = HitResult.Hit;
+                    Judgement.TaikoResult = TaikoHitResult.Great;
+                }
+            }
+            else
+            {
+                if (Judgement.TimeOffset < 0)
+                    return;
+
+                //TODO: THIS IS SHIT AND CAN'T EXIST POST-TAIKO WORLD CUP
+                if (userHits > HitObject.RequiredHits / 2)
+                {
+                    Judgement.Result = HitResult.Hit;
+                    Judgement.TaikoResult = TaikoHitResult.Good;
+                }
+                else
+                    Judgement.Result = HitResult.Miss;
+            }
+        }
+
+        protected override void UpdateState(ArmedState state)
+        {
+            const float preempt = 100;
+
+            Delay(HitObject.StartTime - Time.Current - preempt, true);
+
+            targetRing.ScaleTo(target_ring_scale, preempt * 4, EasingTypes.OutQuint);
+
+            Delay(preempt, true);
+
+            Delay(Judgement.TimeOffset + HitObject.Duration, true);
+
+            const float out_transition_time = 300;
+
+            switch (state)
+            {
+                case ArmedState.Hit:
+                    bodyContainer.ScaleTo(1.4f, out_transition_time);
+                    break;
+            }
+
+            FadeOut(out_transition_time, EasingTypes.Out);
+
+            Expire();
+        }
+
+        protected override void UpdateScrollPosition(double time)
+        {
+            // Make the swell stop at the hit target
+            double t = Math.Min(HitObject.StartTime, time);
+
+            if (t == HitObject.StartTime && !hasStarted)
+            {
+                OnStart?.Invoke();
+                hasStarted = true;
+            }
+
+            base.UpdateScrollPosition(t);
+        }
+
+        protected override bool HandleKeyPress(Key key)
+        {
+            if (Judgement.Result != HitResult.None)
+                return false;
+
+            // Don't handle keys before the swell starts
+            if (Time.Current < HitObject.StartTime)
+                return false;
+
+            // Find the keyset which this key corresponds to
+            var keySet = rimKeys.Contains(key) ? rimKeys : centreKeys;
+
+            // Ensure alternating keysets
+            if (keySet == lastKeySet)
+                return false;
+            lastKeySet = keySet;
+
+            UpdateJudgement(true);
+
+            return true;
+        }
+    }
+}

osu.Game.Modes.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs

@@ -1,16 +1,20 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK.Input;
+using System.Collections.Generic;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Taiko.Judgements;
-using System.Collections.Generic;
-using osu.Framework.Input;
+using osu.Game.Modes.Taiko.Objects.Drawables.Pieces;
+using OpenTK;
+using OpenTK.Input;
 
-namespace osu.Game.Modes.Taiko.Objects.Drawable
+namespace osu.Game.Modes.Taiko.Objects.Drawables
 {
-    public abstract class DrawableTaikoHitObject : DrawableHitObject<TaikoHitObject, TaikoJudgement>
+    public abstract class DrawableTaikoHitObject<TaikoHitType> : DrawableHitObject<TaikoHitObject, TaikoJudgement>
+        where TaikoHitType : TaikoHitObject
     {
         /// <summary>
         /// A list of keys which this hit object will accept. These are the standard Taiko keys for now.
@@ -18,34 +22,52 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
         /// </summary>
         private readonly List<Key> validKeys = new List<Key>(new[] { Key.D, Key.F, Key.J, Key.K });
 
-        protected DrawableTaikoHitObject(TaikoHitObject hitObject)
+        public override Vector2 OriginPosition => new Vector2(DrawHeight / 2);
+
+        protected override Container<Drawable> Content => bodyContainer;
+
+        protected readonly TaikoPiece MainPiece;
+
+        private readonly Container bodyContainer;
+
+        public new TaikoHitType HitObject;
+
+        protected DrawableTaikoHitObject(TaikoHitType hitObject)
             : base(hitObject)
         {
+            HitObject = hitObject;
+
             Anchor = Anchor.CentreLeft;
-            Origin = Anchor.Centre;
+            Origin = Anchor.Custom;
+
+            AutoSizeAxes = Axes.Both;
 
             RelativePositionAxes = Axes.X;
-        }
 
-        protected override void LoadComplete()
-        {
-            LifetimeStart = HitObject.StartTime - HitObject.PreEmpt * 2;
-            LifetimeEnd = HitObject.StartTime + HitObject.PreEmpt;
+            AddInternal(bodyContainer = new Container
+            {
+                AutoSizeAxes = Axes.Both,
+                Children = new[]
+                {
+                    MainPiece = CreateMainPiece()
+                }
+            });
 
-            base.LoadComplete();
+            MainPiece.KiaiMode = HitObject.Kiai;
+
+            LifetimeStart = HitObject.StartTime - HitObject.ScrollTime * 2;
         }
 
         protected override TaikoJudgement CreateJudgement() => new TaikoJudgement();
 
+        protected virtual TaikoPiece CreateMainPiece() => new CirclePiece(HitObject.IsStrong);
+
         /// <summary>
         /// Sets the scroll position of the DrawableHitObject relative to the offset between
         /// a time value and the HitObject's StartTime.
         /// </summary>
         /// <param name="time"></param>
-        protected virtual void UpdateScrollPosition(double time)
-        {
-            MoveToX((float)((HitObject.StartTime - time) / HitObject.PreEmpt));
-        }
+        protected virtual void UpdateScrollPosition(double time) => X = (float)((HitObject.StartTime - time) / HitObject.ScrollTime);
 
         protected override void Update()
         {

osu.Game.Modes.Taiko/Objects/Drawables/Pieces/CentreHitSymbolPiece.cs

@@ -0,0 +1,31 @@
+// Copyright (c) 2007-2017 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.Graphics.Sprites;
+using OpenTK;
+
+namespace osu.Game.Modes.Taiko.Objects.Drawables.Pieces
+{
+    /// <summary>
+    /// The symbol used for centre hit pieces.
+    /// </summary>
+    public class CentreHitSymbolPiece : CircularContainer
+    {
+        public CentreHitSymbolPiece()
+        {
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+            Size = new Vector2(CirclePiece.SYMBOL_INNER_SIZE);
+            Masking = true;
+            Children = new[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both
+                }
+            };
+        }
+    }
+}

osu.Game.Modes.Taiko/Objects/Drawables/Pieces/CirclePiece.cs

@@ -0,0 +1,152 @@
+// Copyright (c) 2007-2017 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 osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics.Backgrounds;
+using OpenTK.Graphics;
+
+namespace osu.Game.Modes.Taiko.Objects.Drawables.Pieces
+{
+    /// <summary>
+    /// A circle piece which is used uniformly through osu!taiko to visualise hitobjects.
+    /// <para>
+    /// Note that this can actually be non-circle if the width is changed. See <see cref="ElongatedCirclePiece"/>
+    /// for a usage example.
+    /// </para>
+    /// </summary>
+    public class CirclePiece : TaikoPiece
+    {
+        public const float SYMBOL_SIZE = TaikoHitObject.DEFAULT_CIRCLE_DIAMETER * 0.45f;
+        public const float SYMBOL_BORDER = 8;
+        public const float SYMBOL_INNER_SIZE = SYMBOL_SIZE - 2 * SYMBOL_BORDER;
+
+        /// <summary>
+        /// The colour of the inner circle and outer glows.
+        /// </summary>
+        public override Color4 AccentColour
+        {
+            get { return base.AccentColour; }
+            set
+            {
+                base.AccentColour = value;
+
+                background.Colour = AccentColour;
+
+                resetEdgeEffects();
+            }
+        }
+
+        /// <summary>
+        /// Whether Kiai mode effects are enabled for this circle piece.
+        /// </summary>
+        public override bool KiaiMode
+        {
+            get { return base.KiaiMode; }
+            set
+            {
+                base.KiaiMode = value;
+
+                resetEdgeEffects();
+            }
+        }
+
+        protected override Container<Drawable> Content => content;
+
+        private readonly Container content;
+
+        private readonly Container background;
+
+        public Box FlashBox;
+
+        public CirclePiece(bool isStrong = false)
+        {
+            AddInternal(new Drawable[]
+            {
+                background = new CircularContainer
+                {
+                    Name = "Background",
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        new Triangles
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            RelativeSizeAxes = Axes.Both,
+                            ColourLight = Color4.White,
+                            ColourDark = Color4.White.Darken(0.1f)
+                        }
+                    }
+                },
+                new CircularContainer
+                {
+                    Name = "Ring",
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    BorderThickness = 8,
+                    BorderColour = Color4.White,
+                    Masking = true,
+                    Children = new[]
+                    {
+                        FlashBox = new Box
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = Color4.White,
+                            BlendingMode = BlendingMode.Additive,
+                            Alpha = 0,
+                            AlwaysPresent = true
+                        }
+                    }
+                },
+                content = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Name = "Content",
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                }
+            });
+
+            if (isStrong)
+            {
+                Size *= TaikoHitObject.STRONG_CIRCLE_DIAMETER_SCALE;
+
+                //default for symbols etc.
+                Content.Scale *= TaikoHitObject.STRONG_CIRCLE_DIAMETER_SCALE;
+            }
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            //we want to allow for width of content to remain mapped to the area inside us, regardless of the scale applied above.
+            Content.Width = 1 / Content.Scale.X;
+        }
+
+        private void resetEdgeEffects()
+        {
+            background.EdgeEffect = new EdgeEffect
+            {
+                Type = EdgeEffectType.Glow,
+                Colour = AccentColour,
+                Radius = KiaiMode ? 50 : 8
+            };
+        }
+    }
+}

osu.Game.Modes.Taiko/Objects/Drawables/Pieces/ElongatedCirclePiece.cs

@@ -0,0 +1,41 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using osu.Framework.Graphics.Primitives;
+using osu.Game.Modes.Taiko.UI;
+
+namespace osu.Game.Modes.Taiko.Objects.Drawables.Pieces
+{
+    public class ElongatedCirclePiece : CirclePiece
+    {
+        /// <summary>
+        /// As we are being used to define the absolute size of hits, we need to be given a relative reference of our containing <see cref="TaikoPlayfield"/>.
+        /// </summary>
+        public Func<float> PlayfieldLengthReference;
+
+        /// <summary>
+        /// The length of this piece as a multiple of the value returned by <see cref="PlayfieldLengthReference"/>
+        /// </summary>
+        public float Length;
+
+        public ElongatedCirclePiece(bool isStrong = false) : base(isStrong)
+        {
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            var padding = Content.DrawHeight * Content.Width / 2;
+
+            Content.Padding = new MarginPadding
+            {
+                Left = padding,
+                Right = padding,
+            };
+
+            Width = (PlayfieldLengthReference?.Invoke() ?? 0) * Length + DrawHeight;
+        }
+    }
+}

osu.Game.Modes.Taiko/Objects/Drawables/Pieces/RimHitSymbolPiece.cs

@@ -0,0 +1,36 @@
+// Copyright (c) 2007-2017 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.Graphics.Sprites;
+using OpenTK;
+using OpenTK.Graphics;
+
+namespace osu.Game.Modes.Taiko.Objects.Drawables.Pieces
+{
+    /// <summary>
+    /// The symbol used for rim hit pieces.
+    /// </summary>
+    public class RimHitSymbolPiece : CircularContainer
+    {
+        public RimHitSymbolPiece()
+        {
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+            Size = new Vector2(CirclePiece.SYMBOL_SIZE);
+            BorderThickness = CirclePiece.SYMBOL_BORDER;
+            BorderColour = Color4.White;
+            Masking = true;
+            Children = new[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Alpha = 0,
+                    AlwaysPresent = true
+                }
+            };
+        }
+    }
+}

osu.Game.Modes.Taiko/Objects/Drawables/Pieces/SwellSymbolPiece.cs

@@ -0,0 +1,24 @@
+// Copyright (c) 2007-2017 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.Game.Graphics;
+
+namespace osu.Game.Modes.Taiko.Objects.Drawables.Pieces
+{
+    /// <summary>
+    /// The symbol used for swell pieces.
+    /// </summary>
+    public class SwellSymbolPiece : TextAwesome
+    {
+        public SwellSymbolPiece()
+        {
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+            UseFullGlyphHeight = true;
+            TextSize = CirclePiece.SYMBOL_INNER_SIZE;
+            Icon = FontAwesome.fa_asterisk;
+            Shadow = false;
+        }
+    }
+}

osu.Game.Modes.Taiko/Objects/Drawables/Pieces/TaikoPiece.cs

@@ -0,0 +1,45 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using OpenTK;
+using OpenTK.Graphics;
+
+namespace osu.Game.Modes.Taiko.Objects.Drawables.Pieces
+{
+    public class TaikoPiece : Container, IHasAccentColour
+    {
+        private Color4 accentColour;
+        /// <summary>
+        /// The colour of the inner circle and outer glows.
+        /// </summary>
+        public virtual Color4 AccentColour
+        {
+            get { return accentColour; }
+            set
+            {
+                accentColour = value;
+            }
+        }
+
+        private bool kiaiMode;
+        /// <summary>
+        /// Whether Kiai mode effects are enabled for this circle piece.
+        /// </summary>
+        public virtual bool KiaiMode
+        {
+            get { return kiaiMode; }
+            set
+            {
+                kiaiMode = value;
+            }
+        }
+
+        public TaikoPiece()
+        {
+            //just a default
+            Size = new Vector2(TaikoHitObject.DEFAULT_CIRCLE_DIAMETER);
+        }
+    }
+}

osu.Game.Modes.Taiko/Objects/Drawables/Pieces/TickPiece.cs

@@ -0,0 +1,60 @@
+// Copyright (c) 2007-2017 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.Graphics.Sprites;
+using OpenTK;
+using OpenTK.Graphics;
+
+namespace osu.Game.Modes.Taiko.Objects.Drawables.Pieces
+{
+    public class TickPiece : TaikoPiece
+    {
+        /// <summary>
+        /// Any tick that is not the first for a drumroll is not filled, but is instead displayed
+        /// as a hollow circle. This is what controls the border width of that circle.
+        /// </summary>
+        private const float tick_border_width = TaikoHitObject.DEFAULT_CIRCLE_DIAMETER / 16;
+
+        /// <summary>
+        /// The size of a tick.
+        /// </summary>
+        private const float tick_size = TaikoHitObject.DEFAULT_CIRCLE_DIAMETER / 4;
+
+        private bool filled;
+        public bool Filled
+        {
+            get { return filled; }
+            set
+            {
+                filled = value;
+                fillBox.Alpha = filled ? 1 : 0;
+            }
+        }
+
+        private readonly Box fillBox;
+
+        public TickPiece()
+        {
+            Size = new Vector2(tick_size);
+
+            Add(new CircularContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Masking = true,
+                BorderThickness = tick_border_width,
+                BorderColour = Color4.White,
+                Children = new[]
+                {
+                    fillBox = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Alpha = 0,
+                        AlwaysPresent = true
+                    }
+                }
+            });
+        }
+    }
+}

osu.Game.Modes.Taiko/Objects/DrumRoll.cs

@@ -1,37 +1,31 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Game.Beatmaps.Samples;
 using osu.Game.Modes.Objects.Types;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Database;
+using osu.Game.Audio;
 
 namespace osu.Game.Modes.Taiko.Objects
 {
-    public class DrumRoll : TaikoHitObject, IHasDistance
+    public class DrumRoll : TaikoHitObject, IHasEndTime
     {
-        public double EndTime => StartTime + Distance / Velocity;
+        /// <summary>
+        /// Drum roll distance that results in a duration of 1 speed-adjusted beat length.
+        /// </summary>
+        private const float base_distance = 100;
 
-        public double Duration => EndTime - StartTime;
+        public double EndTime => StartTime + Duration;
+
+        public double Duration { get; set; }
 
         /// <summary>
-        /// Raw length of the drum roll in positional length units.
+        /// Numer of ticks per beat length.
         /// </summary>
-        public double Distance { get; set; }
-
-        /// <summary>
-        /// Velocity of the drum roll in positional length units per millisecond.
-        /// </summary>
-        public double Velocity { get; protected set; }
-
-        /// <summary>
-        /// The distance between ticks of this drumroll.
-        /// <para>Half of this value is the hit window of the ticks.</para>
-        /// </summary>
-        public double TickTimeDistance { get; protected set; }
+        public int TickRate = 1;
 
         /// <summary>
         /// Number of drum roll ticks required for a "Good" hit.
@@ -55,18 +49,17 @@ namespace osu.Game.Modes.Taiko.Objects
 
         private List<DrumRollTick> ticks;
 
+        /// <summary>
+        /// The length (in milliseconds) between ticks of this drumroll.
+        /// <para>Half of this value is the hit window of the ticks.</para>
+        /// </summary>
+        private double tickSpacing = 100;
+
         public override void ApplyDefaults(TimingInfo timing, BeatmapDifficulty difficulty)
         {
             base.ApplyDefaults(timing, difficulty);
 
-            Velocity = timing.SliderVelocityAt(StartTime) * difficulty.SliderMultiplier / 1000;
-            TickTimeDistance = timing.BeatLengthAt(StartTime);
-
-            //TODO: move this to legacy conversion code to allow for direct division without special case.
-            if (difficulty.SliderTickRate == 3)
-                TickTimeDistance /= 3;
-            else
-                TickTimeDistance /= 4;
+            tickSpacing = timing.BeatLengthAt(StartTime) / TickRate;
 
             RequiredGoodHits = TotalTicks * Math.Min(0.15, 0.05 + 0.10 / 6 * difficulty.OverallDifficulty);
             RequiredGreatHits = TotalTicks * Math.Min(0.30, 0.10 + 0.20 / 6 * difficulty.OverallDifficulty);
@@ -76,23 +69,25 @@ namespace osu.Game.Modes.Taiko.Objects
         {
             var ret = new List<DrumRollTick>();
 
-            if (TickTimeDistance == 0)
+            if (tickSpacing == 0)
                 return ret;
 
             bool first = true;
-            for (double t = StartTime; t < EndTime + (int)TickTimeDistance; t += TickTimeDistance)
+            for (double t = StartTime; t < EndTime + tickSpacing / 2; t += tickSpacing)
             {
                 ret.Add(new DrumRollTick
                 {
                     FirstTick = first,
-                    PreEmpt = PreEmpt,
-                    TickTimeDistance = TickTimeDistance,
+                    ScrollTime = ScrollTime,
+                    TickSpacing = tickSpacing,
                     StartTime = t,
-                    Sample = new HitSampleInfo
+                    IsStrong = IsStrong,
+                    Samples = Samples.Select(s => new SampleInfo
                     {
-                        Type = SampleType.None,
-                        Set = SampleSet.Soft
-                    }
+                        Bank = s.Bank,
+                        Name = @"slidertick",
+                        Volume = s.Volume
+                    }).ToList()
                 });
 
                 first = false;

osu.Game.Modes.Taiko/Objects/DrumRollTick.cs

@@ -11,14 +11,14 @@ namespace osu.Game.Modes.Taiko.Objects
         public bool FirstTick;
 
         /// <summary>
-        /// The distance between this tick and the next in milliseconds.
+        /// The length (in milliseconds) between this tick and the next.
         /// <para>Half of this value is the hit window of the tick.</para>
         /// </summary>
-        public double TickTimeDistance;
+        public double TickSpacing;
 
         /// <summary>
         /// The time allowed to hit this tick.
         /// </summary>
-        public double HitWindow => TickTimeDistance / 2;
+        public double HitWindow => TickSpacing / 2;
     }
 }

osu.Game.Modes.Taiko/Objects/RimHit.cs

@@ -1,12 +1,9 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Game.Beatmaps.Samples;
-
-namespace osu.Game.Beatmaps.Timing
+namespace osu.Game.Modes.Taiko.Objects
 {
-    public class SampleChange : ControlPoint
+    public class RimHit : Hit
     {
-        public SampleInfo Sample;
     }
 }

osu.Game.Modes.Taiko/Objects/Swell.cs

@@ -1,30 +1,19 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
-using osu.Game.Beatmaps.Timing;
-using osu.Game.Database;
 using osu.Game.Modes.Objects.Types;
 
 namespace osu.Game.Modes.Taiko.Objects
 {
     public class Swell : TaikoHitObject, IHasEndTime
     {
-        public double EndTime { get; set; }
+        public double EndTime => StartTime + Duration;
 
-        public double Duration => EndTime - StartTime;
+        public double Duration { get; set; }
 
         /// <summary>
         /// The number of hits required to complete the swell successfully.
         /// </summary>
-        public int RequiredHits { get; protected set; }
-
-        public override void ApplyDefaults(TimingInfo timing, BeatmapDifficulty difficulty)
-        {
-            base.ApplyDefaults(timing, difficulty);
-
-            double spinnerRotationRatio = BeatmapDifficulty.DifficultyRange(difficulty.OverallDifficulty, 3, 5, 7.5);
-            RequiredHits = (int)Math.Max(1, Duration / 1000f * spinnerRotationRatio);
-        }
+        public int RequiredHits = 10;
     }
 }

osu.Game.Modes.Taiko/Objects/TaikoHitObject.cs

@@ -4,20 +4,41 @@
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Database;
 using osu.Game.Modes.Objects;
+using osu.Game.Modes.Taiko.UI;
 
 namespace osu.Game.Modes.Taiko.Objects
 {
     public abstract class TaikoHitObject : HitObject
     {
         /// <summary>
-        /// HitCircle radius.
+        /// Diameter of a circle relative to the size of the <see cref="TaikoPlayfield"/>.
         /// </summary>
-        public const float CIRCLE_RADIUS = 64;
+        public const float PLAYFIELD_RELATIVE_DIAMETER = 0.5f;
 
         /// <summary>
-        /// The time to scroll in the HitObject.
+        /// Scale multiplier for a strong circle.
         /// </summary>
-        public double PreEmpt;
+        public const float STRONG_CIRCLE_DIAMETER_SCALE = 1.5f;
+
+        /// <summary>
+        /// Default circle diameter.
+        /// </summary>
+        public const float DEFAULT_CIRCLE_DIAMETER = TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT * PLAYFIELD_RELATIVE_DIAMETER;
+
+        /// <summary>
+        /// Default strong circle diameter.
+        /// </summary>
+        public const float DEFAULT_STRONG_CIRCLE_DIAMETER = DEFAULT_CIRCLE_DIAMETER * STRONG_CIRCLE_DIAMETER_SCALE;
+
+        /// <summary>
+        /// The time taken from the initial (off-screen) spawn position to the centre of the hit target for a <see cref="ControlPoint.BeatLength"/> of 1000ms.
+        /// </summary>
+        private const double scroll_time = 6000;
+
+        /// <summary>
+        /// Our adjusted <see cref="scroll_time"/> taking into consideration local <see cref="ControlPoint.BeatLength"/> and other speed multipliers.
+        /// </summary>
+        public double ScrollTime;
 
         /// <summary>
         /// Whether this HitObject is a "strong" type.
@@ -34,7 +55,7 @@ namespace osu.Game.Modes.Taiko.Objects
         {
             base.ApplyDefaults(timing, difficulty);
 
-            PreEmpt = 600 / (timing.SliderVelocityAt(StartTime) * difficulty.SliderMultiplier) * 1000;
+            ScrollTime = scroll_time * (timing.BeatLengthAt(StartTime) * timing.SpeedMultiplierAt(StartTime) / 1000) / difficulty.SliderMultiplier;
 
             ControlPoint overridePoint;
             Kiai = timing.TimingPointAt(StartTime, out overridePoint).KiaiMode;

osu.Game.Modes.Taiko/Properties/AssemblyInfo.cs

@@ -4,7 +4,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("osu.Game.Modes.Taiko")]
@@ -16,8 +16,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
@@ -27,11 +27,11 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]

osu.Game.Modes.Taiko/Replays/TaikoAutoReplay.cs

@@ -0,0 +1,116 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using osu.Game.Beatmaps;
+using osu.Game.Modes.Objects.Types;
+using osu.Game.Modes.Taiko.Objects;
+using osu.Game.Modes.Replays;
+
+namespace osu.Game.Modes.Taiko.Replays
+{
+    public class TaikoAutoReplay : Replay
+    {
+        private readonly Beatmap<TaikoHitObject> beatmap;
+
+        public TaikoAutoReplay(Beatmap<TaikoHitObject> beatmap)
+        {
+            this.beatmap = beatmap;
+
+            createAutoReplay();
+        }
+
+        private void createAutoReplay()
+        {
+            bool hitButton = true;
+
+            Frames.Add(new ReplayFrame(-100000, 320, 240, ReplayButtonState.None));
+            Frames.Add(new ReplayFrame(beatmap.HitObjects[0].StartTime - 1000, 320, 240, ReplayButtonState.None));
+
+            for (int i = 0; i < beatmap.HitObjects.Count; i++)
+            {
+                TaikoHitObject h = beatmap.HitObjects[i];
+
+                ReplayButtonState button;
+
+                IHasEndTime endTimeData = h as IHasEndTime;
+                double endTime = endTimeData?.EndTime ?? h.StartTime;
+
+                Swell swell = h as Swell;
+                DrumRoll drumRoll = h as DrumRoll;
+                Hit hit = h as Hit;
+
+                if (swell != null)
+                {
+                    int d = 0;
+                    int count = 0;
+                    int req = swell.RequiredHits;
+                    double hitRate = swell.Duration / req;
+                    for (double j = h.StartTime; j < endTime; j += hitRate)
+                    {
+                        switch (d)
+                        {
+                            default:
+                                button = ReplayButtonState.Left1;
+                                break;
+                            case 1:
+                                button = ReplayButtonState.Right1;
+                                break;
+                            case 2:
+                                button = ReplayButtonState.Left2;
+                                break;
+                            case 3:
+                                button = ReplayButtonState.Right2;
+                                break;
+                        }
+
+                        Frames.Add(new ReplayFrame(j, 0, 0, button));
+                        d = (d + 1) % 4;
+                        if (++count > req)
+                            break;
+                    }
+                }
+                else if (drumRoll != null)
+                {
+                    foreach (var tick in drumRoll.Ticks)
+                    {
+                        Frames.Add(new ReplayFrame(tick.StartTime, 0, 0, hitButton ? ReplayButtonState.Left1 : ReplayButtonState.Left2));
+                        hitButton = !hitButton;
+                    }
+                }
+                else if (hit != null)
+                {
+                    if (hit is CentreHit)
+                    {
+                        if (h.IsStrong)
+                            button = ReplayButtonState.Right1 | ReplayButtonState.Right2;
+                        else
+                            button = hitButton ? ReplayButtonState.Right1 : ReplayButtonState.Right2;
+                    }
+                    else
+                    {
+                        if (h.IsStrong)
+                            button = ReplayButtonState.Left1 | ReplayButtonState.Left2;
+                        else
+                            button = hitButton ? ReplayButtonState.Left1 : ReplayButtonState.Left2;
+                    }
+
+                    Frames.Add(new ReplayFrame(h.StartTime, 0, 0, button));
+                }
+                else
+                    throw new Exception("Unknown hit object type.");
+
+                Frames.Add(new ReplayFrame(endTime + 1, 0, 0, ReplayButtonState.None));
+
+                if (i < beatmap.HitObjects.Count - 1)
+                {
+                    double waitTime = beatmap.HitObjects[i + 1].StartTime - 1000;
+                    if (waitTime > endTime)
+                        Frames.Add(new ReplayFrame(waitTime, 0, 0, ReplayButtonState.None));
+                }
+
+                hitButton = !hitButton;
+            }
+        }
+    }
+}

osu.Game.Modes.Taiko/Replays/TaikoFramedReplayInputHandler.cs

@@ -0,0 +1,37 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Modes.Replays;
+using System.Collections.Generic;
+using osu.Framework.Input;
+using OpenTK.Input;
+
+namespace osu.Game.Modes.Taiko.Replays
+{
+    internal class TaikoFramedReplayInputHandler : FramedReplayInputHandler
+    {
+        public TaikoFramedReplayInputHandler(Replay replay)
+            : base(replay)
+        {
+        }
+
+        public override List<InputState> GetPendingStates()
+        {
+            var keys = new List<Key>();
+
+            if (CurrentFrame?.MouseRight1 == true)
+                keys.Add(Key.F);
+            if (CurrentFrame?.MouseRight2 == true)
+                keys.Add(Key.J);
+            if (CurrentFrame?.MouseLeft1 == true)
+                keys.Add(Key.D);
+            if (CurrentFrame?.MouseLeft2 == true)
+                keys.Add(Key.K);
+
+            return new List<InputState>
+            {
+                new InputState { Keyboard = new ReplayKeyboardState(keys) }
+            };
+        }
+    }
+}

osu.Game.Modes.Taiko/Scoring/TaikoScoreProcessor.cs

@@ -96,9 +96,9 @@ namespace osu.Game.Modes.Taiko.Scoring
 
         /// <summary>
         /// The multiple of the original score added to the combo portion of the score
-        /// for correctly hitting an accented hit object with both keys.
+        /// for correctly hitting a strong hit object with both keys.
         /// </summary>
-        private double accentedHitScale;
+        private double strongHitScale;
 
         private double hpIncreaseTick;
         private double hpIncreaseGreat;
@@ -128,12 +128,12 @@ namespace osu.Game.Modes.Taiko.Scoring
             hpIncreaseGood = hpMultiplierNormal * hp_hit_good;
             hpIncreaseMiss = BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.Difficulty.DrainRate, hp_miss_min, hp_miss_mid, hp_miss_max);
 
-            var accentedHits = beatmap.HitObjects.FindAll(o => o is Hit && o.IsStrong);
+            var strongHits = beatmap.HitObjects.FindAll(o => o is Hit && o.IsStrong);
 
             // This is a linear function that awards:
-            // 10 times bonus points for hitting an accented hit object with both keys with 30 accented hit objects in the map
-            // 3 times bonus points for hitting an accented hit object with both keys with 120 accented hit objects in the map
-            accentedHitScale = -7d / 90d * MathHelper.Clamp(accentedHits.Count, 30, 120) + 111d / 9d;
+            // 10 times bonus points for hitting a strong hit object with both keys with 30 strong hit objects in the map
+            // 3 times bonus points for hitting a strong hit object with both keys with 120 strong hit objects in the map
+            strongHitScale = -7d / 90d * MathHelper.Clamp(strongHits.Count, 30, 120) + 111d / 9d;
 
             foreach (var obj in beatmap.HitObjects)
             {
@@ -179,7 +179,7 @@ namespace osu.Game.Modes.Taiko.Scoring
             maxComboPortion = comboPortion;
         }
 
-        protected override void OnNewJugement(TaikoJudgement judgement)
+        protected override void OnNewJudgement(TaikoJudgement judgement)
         {
             bool isTick = judgement is TaikoDrumRollTickJudgement;
 
@@ -188,28 +188,7 @@ namespace osu.Game.Modes.Taiko.Scoring
                 totalHits++;
 
             // Apply score changes
-            if (judgement.Result == HitResult.Hit)
-            {
-                double baseValue = judgement.ResultValueForScore;
-
-                // Add bonus points for hitting an accented hit object with the second key
-                if (judgement.SecondHit)
-                    baseValue += baseValue * accentedHitScale;
-
-                // Add score to portions
-                if (isTick)
-                    bonusScore += baseValue;
-                else
-                {
-                    Combo.Value++;
-
-                    // A relevance factor that needs to be applied to make higher combos more relevant
-                    // Value is capped at 400 combo
-                    double comboRelevance = Math.Min(Math.Log(400, combo_base), Math.Max(0.5, Math.Log(Combo.Value, combo_base)));
-
-                    comboPortion += baseValue * comboRelevance;
-                }
-            }
+            addHitScore(judgement);
 
             // Apply HP changes
             switch (judgement.Result)
@@ -235,14 +214,50 @@ namespace osu.Game.Modes.Taiko.Scoring
                     break;
             }
 
-            // Compute the new score + accuracy
+            calculateScore();
+        }
+
+        protected override void OnJudgementChanged(TaikoJudgement judgement)
+        {
+            // Apply score changes
+            addHitScore(judgement);
+
+            calculateScore();
+        }
+
+        private void addHitScore(TaikoJudgement judgement)
+        {
+            if (judgement.Result != HitResult.Hit)
+                return;
+
+            double baseValue = judgement.ResultValueForScore;
+
+            // Add increased score for hitting a strong hit object with the second key
+            if (judgement.SecondHit)
+                baseValue *= strongHitScale;
+
+            // Add score to portions
+            if (judgement is TaikoDrumRollTickJudgement)
+                bonusScore += baseValue;
+            else
+            {
+                // A relevance factor that needs to be applied to make higher combos more relevant
+                // Value is capped at 400 combo
+                double comboRelevance = Math.Min(Math.Log(400, combo_base), Math.Max(0.5, Math.Log(Combo.Value, combo_base)));
+
+                comboPortion += baseValue * comboRelevance;
+            }
+        }
+
+        private void calculateScore()
+        {
             int scoreForAccuracy = 0;
             int maxScoreForAccuracy = 0;
 
             foreach (var j in Judgements)
             {
                 scoreForAccuracy += j.ResultValueForAccuracy;
-                maxScoreForAccuracy = j.MaxResultValueForAccuracy;
+                maxScoreForAccuracy += j.MaxResultValueForAccuracy;
             }
 
             Accuracy.Value = (double)scoreForAccuracy / maxScoreForAccuracy;

osu.Game.Modes.Taiko/TaikoRuleset.cs

@@ -65,7 +65,7 @@ namespace osu.Game.Modes.Taiko
                         {
                             Mods = new Mod[]
                             {
-                                new ModAutoplay(),
+                                new TaikoModAutoplay(),
                                 new ModCinema(),
                             },
                         },

osu.Game.Modes.Taiko/UI/HitExplosion.cs

@@ -18,14 +18,18 @@ namespace osu.Game.Modes.Taiko.UI
     /// </summary>
     internal class HitExplosion : CircularContainer
     {
-        private readonly TaikoJudgement judgement;
+        /// <summary>
+        /// The judgement this hit explosion visualises.
+        /// </summary>
+        public readonly TaikoJudgement Judgement;
+
         private readonly Box innerFill;
 
         public HitExplosion(TaikoJudgement judgement)
         {
-            this.judgement = judgement;
+            Judgement = judgement;
 
-            Size = new Vector2(TaikoHitObject.CIRCLE_RADIUS * 2);
+            Size = new Vector2(TaikoHitObject.DEFAULT_CIRCLE_DIAMETER);
 
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
@@ -50,10 +54,7 @@ namespace osu.Game.Modes.Taiko.UI
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            if (judgement.SecondHit)
-                Size *= 1.5f;
-
-            switch (judgement.TaikoResult)
+            switch (Judgement.TaikoResult)
             {
                 case TaikoHitResult.Good:
                     innerFill.Colour = colours.Green;
@@ -73,5 +74,13 @@ namespace osu.Game.Modes.Taiko.UI
 
             Expire();
         }
+
+        /// <summary>
+        /// Transforms this hit explosion to visualise a secondary hit.
+        /// </summary>
+        public void VisualiseSecondHit()
+        {
+            ResizeTo(Size * TaikoHitObject.STRONG_CIRCLE_DIAMETER_SCALE, 50);
+        }
     }
 }

osu.Game.Modes.Taiko/UI/HitTarget.cs

@@ -15,16 +15,6 @@ namespace osu.Game.Modes.Taiko.UI
     /// </summary>
     internal class HitTarget : Container
     {
-        /// <summary>
-        /// Diameter of normal hit object circles.
-        /// </summary>
-        private const float normal_diameter = TaikoHitObject.CIRCLE_RADIUS * 2 * TaikoPlayfield.PLAYFIELD_SCALE;
-        
-        /// <summary>
-        /// Diameter of finisher hit object circles.
-        /// </summary>
-        private const float finisher_diameter = normal_diameter * 1.5f;
-
         /// <summary>
         /// The 1px inner border of the taiko playfield.
         /// </summary>
@@ -37,7 +27,7 @@ namespace osu.Game.Modes.Taiko.UI
 
         public HitTarget()
         {
-            RelativeSizeAxes = Axes.Y;
+            Size = new Vector2(TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT);
 
             Children = new Drawable[]
             {
@@ -47,15 +37,15 @@ namespace osu.Game.Modes.Taiko.UI
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
                     Y = border_offset,
-                    Size = new Vector2(border_thickness, (TaikoPlayfield.PlayfieldHeight - finisher_diameter) / 2f - border_offset),
+                    Size = new Vector2(border_thickness, (TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT - TaikoHitObject.DEFAULT_STRONG_CIRCLE_DIAMETER) / 2f - border_offset),
                     Alpha = 0.1f
                 },
                 new CircularContainer
                 {
-                    Name = "Finisher Ring",
+                    Name = "Strong Hit Ring",
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Size = new Vector2(finisher_diameter),
+                    Size = new Vector2(TaikoHitObject.DEFAULT_STRONG_CIRCLE_DIAMETER),
                     Masking = true,
                     BorderColour = Color4.White,
                     BorderThickness = border_thickness,
@@ -72,10 +62,10 @@ namespace osu.Game.Modes.Taiko.UI
                 },
                 new CircularContainer
                 {
-                    Name = "Normal Ring",
+                    Name = "Normal Hit Ring",
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Size = new Vector2(normal_diameter),
+                    Size = new Vector2(TaikoHitObject.DEFAULT_CIRCLE_DIAMETER),
                     Masking = true,
                     BorderColour = Color4.White,
                     BorderThickness = border_thickness,
@@ -96,7 +86,7 @@ namespace osu.Game.Modes.Taiko.UI
                     Anchor = Anchor.BottomCentre,
                     Origin = Anchor.BottomCentre,
                     Y = -border_offset,
-                    Size = new Vector2(border_thickness, (TaikoPlayfield.PlayfieldHeight - finisher_diameter) / 2f - border_offset),
+                    Size = new Vector2(border_thickness, (TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT - TaikoHitObject.DEFAULT_STRONG_CIRCLE_DIAMETER) / 2f - border_offset),
                     Alpha = 0.1f
                 },
             };

osu.Game.Modes.Taiko/UI/InputDrum.cs

@@ -21,7 +21,7 @@ namespace osu.Game.Modes.Taiko.UI
     {
         public InputDrum()
         {
-            Size = new Vector2(TaikoPlayfield.PlayfieldHeight);
+            Size = new Vector2(TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT);
 
             const float middle_split = 10;
 
@@ -60,7 +60,7 @@ namespace osu.Game.Modes.Taiko.UI
             /// The key to be used for the rim of the half-drum.
             /// </summary>
             public Key RimKey;
-            
+
             /// <summary>
             /// The key to be used for the centre of the half-drum.
             /// </summary>
@@ -128,17 +128,36 @@ namespace osu.Game.Modes.Taiko.UI
                     return false;
 
                 Drawable target = null;
+                Drawable back = null;
 
                 if (args.Key == CentreKey)
+                {
                     target = centreHit;
+                    back = centre;
+                }
                 else if (args.Key == RimKey)
+                {
                     target = rimHit;
+                    back = rim;
+                }
 
                 if (target != null)
                 {
-                    target.FadeTo(Math.Min(target.Alpha + 0.4f, 1), 40, EasingTypes.OutQuint);
-                    target.Delay(40);
-                    target.FadeOut(1000, EasingTypes.OutQuint);
+                    const float scale_amount = 0.05f;
+                    const float alpha_amount = 0.5f;
+
+                    const float down_time = 40;
+                    const float up_time = 1000;
+
+                    back.ScaleTo(target.Scale.X - scale_amount, down_time, EasingTypes.OutQuint);
+                    back.Delay(down_time);
+                    back.ScaleTo(1, up_time, EasingTypes.OutQuint);
+
+                    target.ScaleTo(target.Scale.X - scale_amount, down_time, EasingTypes.OutQuint);
+                    target.FadeTo(Math.Min(target.Alpha + alpha_amount, 1), down_time, EasingTypes.OutQuint);
+                    target.Delay(down_time);
+                    target.ScaleTo(1, up_time, EasingTypes.OutQuint);
+                    target.FadeOut(up_time, EasingTypes.OutQuint);
                 }
 
                 return false;