Merge branch 'master' into fix-dotsettings-file

osu.Game.Rulesets.Catch/Mods/CatchMod.cs

@@ -1,69 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Game.Rulesets.Mods;
-
-namespace osu.Game.Rulesets.Catch.Mods
-{
-    public class CatchModNoFail : ModNoFail
-    {
-
-    }
-
-    public class CatchModEasy : ModEasy
-    {
-
-    }
-
-    public class CatchModHidden : ModHidden
-    {
-        public override string Description => @"Play with fading notes for a slight score advantage.";
-        public override double ScoreMultiplier => 1.06;
-    }
-
-    public class CatchModHardRock : ModHardRock
-    {
-        public override double ScoreMultiplier => 1.12;
-        public override bool Ranked => true;
-    }
-
-    public class CatchModSuddenDeath : ModSuddenDeath
-    {
-
-    }
-
-    public class CatchModDaycore : ModDaycore
-    {
-        public override double ScoreMultiplier => 0.5;
-    }
-
-    public class CatchModDoubleTime : ModDoubleTime
-    {
-        public override double ScoreMultiplier => 1.06;
-    }
-
-    public class CatchModRelax : ModRelax
-    {
-        public override string Description => @"Use the mouse to control the catcher.";
-    }
-
-    public class CatchModHalfTime : ModHalfTime
-    {
-        public override double ScoreMultiplier => 0.5;
-    }
-
-    public class CatchModNightcore : ModNightcore
-    {
-        public override double ScoreMultiplier => 1.06;
-    }
-
-    public class CatchModFlashlight : ModFlashlight
-    {
-        public override double ScoreMultiplier => 1.12;
-    }
-
-    public class CatchModPerfect : ModPerfect
-    {
-
-    }
-}

osu.Game.Rulesets.Catch/Mods/CatchModDaycore.cs

@@ -0,0 +1,12 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Catch.Mods
+{
+    public class CatchModDaycore : ModDaycore
+    {
+        public override double ScoreMultiplier => 0.5;
+    }
+}

osu.Game.Rulesets.Catch/Mods/CatchModDoubleTime.cs

@@ -0,0 +1,12 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Catch.Mods
+{
+    public class CatchModDoubleTime : ModDoubleTime
+    {
+        public override double ScoreMultiplier => 1.06;
+    }
+}

osu.Game.Rulesets.Catch/Mods/CatchModEasy.cs

@@ -0,0 +1,11 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Catch.Mods
+{
+    public class CatchModEasy : ModEasy
+    {
+    }
+}

osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs

@@ -0,0 +1,12 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Catch.Mods
+{
+    public class CatchModFlashlight : ModFlashlight
+    {
+        public override double ScoreMultiplier => 1.12;
+    }
+}

osu.Game.Rulesets.Catch/Mods/CatchModHalfTime.cs

@@ -0,0 +1,12 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Catch.Mods
+{
+    public class CatchModHalfTime : ModHalfTime
+    {
+        public override double ScoreMultiplier => 0.5;
+    }
+}

osu.Game.Rulesets.Catch/Mods/CatchModHardRock.cs

@@ -0,0 +1,13 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Catch.Mods
+{
+    public class CatchModHardRock : ModHardRock
+    {
+        public override double ScoreMultiplier => 1.12;
+        public override bool Ranked => true;
+    }
+}

osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs

@@ -0,0 +1,13 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Catch.Mods
+{
+    public class CatchModHidden : ModHidden
+    {
+        public override string Description => @"Play with fading notes for a slight score advantage.";
+        public override double ScoreMultiplier => 1.06;
+    }
+}

osu.Game.Rulesets.Catch/Mods/CatchModNightcore.cs

@@ -0,0 +1,12 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Catch.Mods
+{
+    public class CatchModNightcore : ModNightcore
+    {
+        public override double ScoreMultiplier => 1.06;
+    }
+}

osu.Game.Rulesets.Catch/Mods/CatchModNoFail.cs

@@ -0,0 +1,11 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Catch.Mods
+{
+    public class CatchModNoFail : ModNoFail
+    {
+    }
+}

osu.Game.Rulesets.Catch/Mods/CatchModPerfect.cs

@@ -0,0 +1,11 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Catch.Mods
+{
+    public class CatchModPerfect : ModPerfect
+    {
+    }
+}

osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs

@@ -0,0 +1,12 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Catch.Mods
+{
+    public class CatchModRelax : ModRelax
+    {
+        public override string Description => @"Use the mouse to control the catcher.";
+    }
+}

osu.Game.Rulesets.Catch/Mods/CatchModSuddenDeath.cs

@@ -0,0 +1,11 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Catch.Mods
+{
+    public class CatchModSuddenDeath : ModSuddenDeath
+    {
+    }
+}

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

@@ -49,6 +49,17 @@
     <Compile Include="Beatmaps\CatchBeatmapProcessor.cs" />
     <Compile Include="CatchDifficultyCalculator.cs" />
     <Compile Include="CatchInputManager.cs" />
+    <Compile Include="Mods\CatchModDaycore.cs" />
+    <Compile Include="Mods\CatchModDoubleTime.cs" />
+    <Compile Include="Mods\CatchModEasy.cs" />
+    <Compile Include="Mods\CatchModFlashlight.cs" />
+    <Compile Include="Mods\CatchModHalfTime.cs" />
+    <Compile Include="Mods\CatchModHardRock.cs" />
+    <Compile Include="Mods\CatchModHidden.cs" />
+    <Compile Include="Mods\CatchModNightcore.cs" />
+    <Compile Include="Mods\CatchModPerfect.cs" />
+    <Compile Include="Mods\CatchModRelax.cs" />
+    <Compile Include="Mods\CatchModSuddenDeath.cs" />
     <Compile Include="Objects\Drawable\DrawableCatchHitObject.cs" />
     <Compile Include="Objects\Drawable\DrawableDroplet.cs" />
     <Compile Include="Objects\Drawable\DrawableJuiceStream.cs" />
@@ -71,7 +82,7 @@
     <Compile Include="UI\CatchRulesetContainer.cs" />
     <Compile Include="UI\CatchPlayfield.cs" />
     <Compile Include="CatchRuleset.cs" />
-    <Compile Include="Mods\CatchMod.cs" />
+    <Compile Include="Mods\CatchModNoFail.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />

osu.Game.Rulesets.Mania/Mods/ManiaKeyMod.cs

@@ -0,0 +1,29 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public abstract class ManiaKeyMod : Mod, IApplicableMod, IApplicableToBeatmapConverter<ManiaHitObject>
+    {
+        public override string ShortenedName => Name;
+        public abstract int KeyCount { get; }
+        public override double ScoreMultiplier => 1; // TODO: Implement the mania key mod score multiplier
+        public override bool Ranked => true;
+
+        public void ApplyToBeatmapConverter(BeatmapConverter<ManiaHitObject> beatmapConverter)
+        {
+            var mbc = (ManiaBeatmapConverter)beatmapConverter;
+
+            // Although this can work, for now let's not allow keymods for mania-specific beatmaps
+            if (mbc.IsForCurrentRuleset)
+                return;
+
+            mbc.TargetColumns = KeyCount;
+        }
+    }
+}

osu.Game.Rulesets.Mania/Mods/ManiaMod.cs

@@ -1,197 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Game.Graphics;
-using osu.Game.Rulesets.Mods;
-using System;
-using System.Linq;
-using osu.Framework.Extensions.IEnumerableExtensions;
-using osu.Framework.MathUtils;
-using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Mania.Beatmaps;
-using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.Mania.Replays;
-using osu.Game.Rulesets.Mania.UI;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Users;
-using osu.Game.Rulesets.UI;
-
-namespace osu.Game.Rulesets.Mania.Mods
-{
-    public class ManiaModNoFail : ModNoFail
-    {
-
-    }
-
-    public class ManiaModEasy : ModEasy
-    {
-
-    }
-
-    public class ManiaModHidden : ModHidden
-    {
-        public override string Description => @"The notes fade out before you hit them!";
-        public override double ScoreMultiplier => 1.0;
-        public override Type[] IncompatibleMods => new[] { typeof(ModFlashlight) };
-    }
-
-    public class ManiaModHardRock : ModHardRock
-    {
-        public override double ScoreMultiplier => 1.0;
-    }
-
-    public class ManiaModSuddenDeath : ModSuddenDeath
-    {
-
-    }
-
-    public class ManiaModDaycore : ModDaycore
-    {
-        public override double ScoreMultiplier => 0.3;
-    }
-
-    public class ManiaModDoubleTime : ModDoubleTime
-    {
-        public override double ScoreMultiplier => 1.0;
-    }
-
-    public class ManiaModHalfTime : ModHalfTime
-    {
-        public override double ScoreMultiplier => 0.3;
-    }
-
-    public class ManiaModNightcore : ModNightcore
-    {
-        public override double ScoreMultiplier => 1.0;
-    }
-
-    public class ManiaModFlashlight : ModFlashlight
-    {
-        public override double ScoreMultiplier => 1.0;
-        public override Type[] IncompatibleMods => new[] { typeof(ModHidden) };
-    }
-
-    public class ManiaModPerfect : ModPerfect
-    {
-
-    }
-
-    public class ManiaModFadeIn : Mod
-    {
-        public override string Name => "FadeIn";
-        public override string ShortenedName => "FI";
-        public override FontAwesome Icon => FontAwesome.fa_osu_mod_hidden;
-        public override ModType Type => ModType.DifficultyIncrease;
-        public override double ScoreMultiplier => 1;
-        public override bool Ranked => true;
-        public override Type[] IncompatibleMods => new[] { typeof(ModFlashlight) };
-    }
-
-    public class ManiaModRandom : Mod, IApplicableToRulesetContainer<ManiaHitObject>
-    {
-        public override string Name => "Random";
-        public override string ShortenedName => "RD";
-        public override FontAwesome Icon => FontAwesome.fa_osu_dice;
-        public override string Description => @"Shuffle around the notes!";
-        public override double ScoreMultiplier => 1;
-
-        public void ApplyToRulesetContainer(RulesetContainer<ManiaHitObject> rulesetContainer)
-        {
-            int availableColumns = ((ManiaRulesetContainer)rulesetContainer).Beatmap.TotalColumns;
-            var shuffledColumns = Enumerable.Range(0, availableColumns).OrderBy(item => RNG.Next()).ToList();
-
-            rulesetContainer.Objects.OfType<ManiaHitObject>().ForEach(h => h.Column = shuffledColumns[h.Column]);
-        }
-    }
-
-    public abstract class ManiaKeyMod : Mod, IApplicableMod, IApplicableToBeatmapConverter<ManiaHitObject>
-    {
-        public override string ShortenedName => Name;
-        public abstract int KeyCount { get; }
-        public override double ScoreMultiplier => 1; // TODO: Implement the mania key mod score multiplier
-        public override bool Ranked => true;
-
-        public void ApplyToBeatmapConverter(BeatmapConverter<ManiaHitObject> beatmapConverter)
-        {
-            var mbc = (ManiaBeatmapConverter)beatmapConverter;
-
-            // Although this can work, for now let's not allow keymods for mania-specific beatmaps
-            if (mbc.IsForCurrentRuleset)
-                return;
-
-            mbc.TargetColumns = KeyCount;
-        }
-    }
-
-    public class ManiaModKey1 : ManiaKeyMod
-    {
-        public override int KeyCount => 1;
-        public override string Name => "1K";
-    }
-
-    public class ManiaModKey2 : ManiaKeyMod
-    {
-        public override int KeyCount => 2;
-        public override string Name => "2K";
-    }
-
-    public class ManiaModKey3 : ManiaKeyMod
-    {
-        public override int KeyCount => 3;
-        public override string Name => "3K";
-    }
-
-    public class ManiaModKey4 : ManiaKeyMod
-    {
-        public override int KeyCount => 4;
-        public override string Name => "4K";
-    }
-
-    public class ManiaModKey5 : ManiaKeyMod
-    {
-        public override int KeyCount => 5;
-        public override string Name => "5K";
-    }
-
-    public class ManiaModKey6 : ManiaKeyMod
-    {
-        public override int KeyCount => 6;
-        public override string Name => "6K";
-    }
-
-    public class ManiaModKey7 : ManiaKeyMod
-    {
-        public override int KeyCount => 7;
-        public override string Name => "7K";
-    }
-
-    public class ManiaModKey8 : ManiaKeyMod
-    {
-        public override int KeyCount => 8;
-        public override string Name => "8K";
-    }
-
-    public class ManiaModKey9 : ManiaKeyMod
-    {
-        public override int KeyCount => 9;
-        public override string Name => "9K";
-    }
-
-    public class ManiaModKeyCoop : Mod
-    {
-        public override string Name => "KeyCoop";
-        public override string ShortenedName => "2P";
-        public override string Description => @"Double the key amount, double the fun!";
-        public override double ScoreMultiplier => 1;
-        public override bool Ranked => true;
-    }
-
-    public class ManiaModAutoplay : ModAutoplay<ManiaHitObject>
-    {
-        protected override Score CreateReplayScore(Beatmap<ManiaHitObject> beatmap) => new Score
-        {
-            User = new User { Username = "osu!topus!" },
-            Replay = new ManiaAutoGenerator(beatmap).Generate(),
-        };
-    }
-}

osu.Game.Rulesets.Mania/Mods/ManiaModAutoplay.cs

@@ -0,0 +1,24 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Replays;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Users;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModAutoplay : ModAutoplay<ManiaHitObject>
+    {
+        protected override Score CreateReplayScore(Beatmap<ManiaHitObject> beatmap)
+        {
+            return new Score
+            {
+                User = new User { Username = "osu!topus!" },
+                Replay = new ManiaAutoGenerator(beatmap).Generate(),
+            };
+        }
+    }
+}

osu.Game.Rulesets.Mania/Mods/ManiaModDaycore.cs

@@ -0,0 +1,12 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModDaycore : ModDaycore
+    {
+        public override double ScoreMultiplier => 0.3;
+    }
+}

osu.Game.Rulesets.Mania/Mods/ManiaModDoubleTime.cs

@@ -0,0 +1,12 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModDoubleTime : ModDoubleTime
+    {
+        public override double ScoreMultiplier => 1.0;
+    }
+}

osu.Game.Rulesets.Mania/Mods/ManiaModEasy.cs

@@ -0,0 +1,11 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModEasy : ModEasy
+    {
+    }
+}

osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs

@@ -0,0 +1,20 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModFadeIn : Mod
+    {
+        public override string Name => "FadeIn";
+        public override string ShortenedName => "FI";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_hidden;
+        public override ModType Type => ModType.DifficultyIncrease;
+        public override double ScoreMultiplier => 1;
+        public override bool Ranked => true;
+        public override Type[] IncompatibleMods => new[] { typeof(ModFlashlight) };
+    }
+}

osu.Game.Rulesets.Mania/Mods/ManiaModFlashlight.cs

@@ -0,0 +1,14 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModFlashlight : ModFlashlight
+    {
+        public override double ScoreMultiplier => 1.0;
+        public override Type[] IncompatibleMods => new[] { typeof(ModHidden) };
+    }
+}

osu.Game.Rulesets.Mania/Mods/ManiaModGravity.cs

@@ -3,13 +3,12 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Timing;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Graphics;
-using osu.Game.Rulesets.Mania.Timing;
 using osu.Game.Rulesets.Timing;
-using osu.Game.Rulesets.Mania.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
@@ -22,12 +21,13 @@ namespace osu.Game.Rulesets.Mania.Mods
 
         public override FontAwesome Icon => FontAwesome.fa_sort_desc;
 
-        public void ApplyToRulesetContainer(ManiaRulesetContainer rulesetContainer, ref List<SpeedAdjustmentContainer>[] hitObjectTimingChanges, ref List<SpeedAdjustmentContainer> barlineTimingChanges)
+        public void ApplyToRulesetContainer(ManiaRulesetContainer rulesetContainer, ref List<SpeedAdjustmentContainer>[] hitObjectTimingChanges,
+                                            ref List<SpeedAdjustmentContainer> barlineTimingChanges)
         {
             // We have to generate one speed adjustment per hit object for gravity
-            foreach (ManiaHitObject obj in rulesetContainer.Objects.OfType<ManiaHitObject>())
+            foreach (var obj in rulesetContainer.Objects.OfType<ManiaHitObject>())
             {
-                MultiplierControlPoint controlPoint = rulesetContainer.CreateControlPointAt(obj.StartTime);
+                var controlPoint = rulesetContainer.CreateControlPointAt(obj.StartTime);
                 // Beat length has too large of an effect for gravity, so we'll force it to a constant value for now
                 controlPoint.TimingPoint.BeatLength = 1000;
 
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Mania.Mods
             }
 
             // Like with hit objects, we need to generate one speed adjustment per bar line
-            foreach (DrawableBarLine barLine in rulesetContainer.BarLines)
+            foreach (var barLine in rulesetContainer.BarLines)
             {
                 var controlPoint = rulesetContainer.CreateControlPointAt(barLine.HitObject.StartTime);
                 // Beat length has too large of an effect for gravity, so we'll force it to a constant value for now

osu.Game.Rulesets.Mania/Mods/ManiaModHalfTime.cs

@@ -0,0 +1,12 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModHalfTime : ModHalfTime
+    {
+        public override double ScoreMultiplier => 0.3;
+    }
+}

osu.Game.Rulesets.Mania/Mods/ManiaModHardRock.cs

@@ -0,0 +1,12 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModHardRock : ModHardRock
+    {
+        public override double ScoreMultiplier => 1.0;
+    }
+}

osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs

@@ -0,0 +1,15 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModHidden : ModHidden
+    {
+        public override string Description => @"The notes fade out before you hit them!";
+        public override double ScoreMultiplier => 1.0;
+        public override Type[] IncompatibleMods => new[] { typeof(ModFlashlight) };
+    }
+}

osu.Game.Rulesets.Mania/Mods/ManiaModKey1.cs

@@ -0,0 +1,11 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModKey1 : ManiaKeyMod
+    {
+        public override int KeyCount => 1;
+        public override string Name => "1K";
+    }
+}

osu.Game.Rulesets.Mania/Mods/ManiaModKey2.cs

@@ -0,0 +1,11 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModKey2 : ManiaKeyMod
+    {
+        public override int KeyCount => 2;
+        public override string Name => "2K";
+    }
+}

osu.Game.Rulesets.Mania/Mods/ManiaModKey3.cs

@@ -0,0 +1,11 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModKey3 : ManiaKeyMod
+    {
+        public override int KeyCount => 3;
+        public override string Name => "3K";
+    }
+}

osu.Game.Rulesets.Mania/Mods/ManiaModKey4.cs

@@ -0,0 +1,11 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModKey4 : ManiaKeyMod
+    {
+        public override int KeyCount => 4;
+        public override string Name => "4K";
+    }
+}

osu.Game.Rulesets.Mania/Mods/ManiaModKey5.cs

@@ -0,0 +1,11 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModKey5 : ManiaKeyMod
+    {
+        public override int KeyCount => 5;
+        public override string Name => "5K";
+    }
+}

osu.Game.Rulesets.Mania/Mods/ManiaModKey6.cs

@@ -0,0 +1,11 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModKey6 : ManiaKeyMod
+    {
+        public override int KeyCount => 6;
+        public override string Name => "6K";
+    }
+}

osu.Game.Rulesets.Mania/Mods/ManiaModKey7.cs

@@ -0,0 +1,11 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModKey7 : ManiaKeyMod
+    {
+        public override int KeyCount => 7;
+        public override string Name => "7K";
+    }
+}

osu.Game.Rulesets.Mania/Mods/ManiaModKey8.cs

@@ -0,0 +1,11 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModKey8 : ManiaKeyMod
+    {
+        public override int KeyCount => 8;
+        public override string Name => "8K";
+    }
+}

osu.Game.Rulesets.Mania/Mods/ManiaModKey9.cs

@@ -0,0 +1,11 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModKey9 : ManiaKeyMod
+    {
+        public override int KeyCount => 9;
+        public override string Name => "9K";
+    }
+}

osu.Game.Rulesets.Mania/Mods/ManiaModKeyCoop.cs

@@ -0,0 +1,16 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModKeyCoop : Mod
+    {
+        public override string Name => "KeyCoop";
+        public override string ShortenedName => "2P";
+        public override string Description => @"Double the key amount, double the fun!";
+        public override double ScoreMultiplier => 1;
+        public override bool Ranked => true;
+    }
+}

osu.Game.Rulesets.Mania/Mods/ManiaModNightcore.cs

@@ -0,0 +1,12 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModNightcore : ModNightcore
+    {
+        public override double ScoreMultiplier => 1.0;
+    }
+}

osu.Game.Rulesets.Mania/Mods/ManiaModNoFail.cs

@@ -0,0 +1,11 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModNoFail : ModNoFail
+    {
+    }
+}

osu.Game.Rulesets.Mania/Mods/ManiaModPerfect.cs

@@ -0,0 +1,11 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModPerfect : ModPerfect
+    {
+    }
+}

osu.Game.Rulesets.Mania/Mods/ManiaModRandom.cs

@@ -0,0 +1,31 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Linq;
+using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.MathUtils;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModRandom : Mod, IApplicableToRulesetContainer<ManiaHitObject>
+    {
+        public override string Name => "Random";
+        public override string ShortenedName => "RD";
+        public override FontAwesome Icon => FontAwesome.fa_osu_dice;
+        public override string Description => @"Shuffle around the notes!";
+        public override double ScoreMultiplier => 1;
+
+        public void ApplyToRulesetContainer(RulesetContainer<ManiaHitObject> rulesetContainer)
+        {
+            var availableColumns = ((ManiaRulesetContainer)rulesetContainer).Beatmap.TotalColumns;
+            var shuffledColumns = Enumerable.Range(0, availableColumns).OrderBy(item => RNG.Next()).ToList();
+
+            rulesetContainer.Objects.OfType<ManiaHitObject>().ForEach(h => h.Column = shuffledColumns[h.Column]);
+        }
+    }
+}

osu.Game.Rulesets.Mania/Mods/ManiaModSuddenDeath.cs

@@ -0,0 +1,11 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModSuddenDeath : ModSuddenDeath
+    {
+    }
+}

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

@@ -65,6 +65,30 @@
     <Compile Include="Judgements\ManiaJudgement.cs" />
     <Compile Include="ManiaDifficultyCalculator.cs" />
     <Compile Include="Mods\IGenerateSpeedAdjustments.cs" />
+    <Compile Include="Mods\ManiaKeyMod.cs" />
+    <Compile Include="Mods\ManiaModAutoplay.cs" />
+    <Compile Include="Mods\ManiaModDaycore.cs" />
+    <Compile Include="Mods\ManiaModDoubleTime.cs" />
+    <Compile Include="Mods\ManiaModEasy.cs" />
+    <Compile Include="Mods\ManiaModFadeIn.cs" />
+    <Compile Include="Mods\ManiaModFlashlight.cs" />
+    <Compile Include="Mods\ManiaModHalfTime.cs" />
+    <Compile Include="Mods\ManiaModHardRock.cs" />
+    <Compile Include="Mods\ManiaModHidden.cs" />
+    <Compile Include="Mods\ManiaModKey1.cs" />
+    <Compile Include="Mods\ManiaModKey2.cs" />
+    <Compile Include="Mods\ManiaModKey3.cs" />
+    <Compile Include="Mods\ManiaModKey4.cs" />
+    <Compile Include="Mods\ManiaModKey5.cs" />
+    <Compile Include="Mods\ManiaModKey6.cs" />
+    <Compile Include="Mods\ManiaModKey7.cs" />
+    <Compile Include="Mods\ManiaModKey8.cs" />
+    <Compile Include="Mods\ManiaModKey9.cs" />
+    <Compile Include="Mods\ManiaModKeyCoop.cs" />
+    <Compile Include="Mods\ManiaModNightcore.cs" />
+    <Compile Include="Mods\ManiaModPerfect.cs" />
+    <Compile Include="Mods\ManiaModRandom.cs" />
+    <Compile Include="Mods\ManiaModSuddenDeath.cs" />
     <Compile Include="Objects\Drawables\DrawableBarLine.cs" />
     <Compile Include="Objects\Drawables\DrawableHoldNote.cs" />
     <Compile Include="Objects\Drawables\DrawableHoldNoteTick.cs" />
@@ -98,7 +122,7 @@
     <Compile Include="UI\ManiaRulesetContainer.cs" />
     <Compile Include="UI\ManiaPlayfield.cs" />
     <Compile Include="ManiaRuleset.cs" />
-    <Compile Include="Mods\ManiaMod.cs" />
+    <Compile Include="Mods\ManiaModNoFail.cs" />
     <Compile Include="Mods\ManiaModGravity.cs" />
     <Compile Include="UI\SpecialColumnPosition.cs" />
     <Compile Include="Timing\ManiaSpeedAdjustmentContainer.cs" />

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

@@ -1,189 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Game.Beatmaps;
-using osu.Game.Graphics;
-using osu.Game.Rulesets.Osu.Replays;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Osu.Objects;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using osu.Game.Rulesets.Osu.UI;
-using osu.Game.Rulesets.Scoring;
-using OpenTK;
-using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Objects.Drawables;
-using osu.Framework.Graphics;
-using osu.Game.Rulesets.Objects.Types;
-
-namespace osu.Game.Rulesets.Osu.Mods
-{
-    public class OsuModNoFail : ModNoFail
-    {
-        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModAutopilot) }).ToArray();
-    }
-
-    public class OsuModEasy : ModEasy
-    {
-    }
-
-    public class OsuModHidden : ModHidden, IApplicableToDrawableHitObjects
-    {
-        public override string Description => @"Play with no approach circles and fading notes for a slight score advantage.";
-        public override double ScoreMultiplier => 1.06;
-
-        private const double fade_in_duration_multiplier = 0.4;
-        private const double fade_out_duration_multiplier = 0.3;
-
-        private float preEmpt => DrawableOsuHitObject.TIME_PREEMPT;
-
-        public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
-        {
-            foreach (var d in drawables.OfType<DrawableOsuHitObject>())
-            {
-                d.ApplyCustomUpdateState += ApplyHiddenState;
-                d.FadeInDuration = preEmpt * fade_in_duration_multiplier;
-            }
-        }
-
-        protected void ApplyHiddenState(DrawableHitObject drawable, ArmedState state)
-        {
-            if (!(drawable is DrawableOsuHitObject d))
-                return;
-
-            var fadeOutStartTime = d.HitObject.StartTime - preEmpt + d.FadeInDuration;
-            var fadeOutDuration = preEmpt * fade_out_duration_multiplier;
-
-            // new duration from completed fade in to end (before fading out)
-            var longFadeDuration = ((d.HitObject as IHasEndTime)?.EndTime ?? d.HitObject.StartTime) - fadeOutStartTime;
-
-            switch (drawable)
-            {
-                case DrawableHitCircle circle:
-                    // we don't want to see the approach circle
-                    circle.ApproachCircle.Hide();
-
-                    // fade out immediately after fade in.
-                    using (drawable.BeginAbsoluteSequence(fadeOutStartTime, true))
-                        circle.FadeOut(fadeOutDuration);
-                    break;
-                case DrawableSlider slider:
-                    using (slider.BeginAbsoluteSequence(fadeOutStartTime, true))
-                        slider.Body.FadeOut(longFadeDuration, Easing.Out);
-                    break;
-                case DrawableSpinner spinner:
-                    // hide elements we don't care about.
-                    spinner.Disc.Hide();
-                    spinner.Ticks.Hide();
-                    spinner.Background.Hide();
-
-                    using (spinner.BeginAbsoluteSequence(fadeOutStartTime + longFadeDuration, true))
-                        spinner.FadeOut(fadeOutDuration);
-                    break;
-            }
-        }
-    }
-
-    public class OsuModHardRock : ModHardRock, IApplicableToHitObject<OsuHitObject>
-    {
-        public override double ScoreMultiplier => 1.06;
-        public override bool Ranked => true;
-
-        public void ApplyToHitObject(OsuHitObject hitObject)
-        {
-            hitObject.Position = new Vector2(hitObject.Position.X, OsuPlayfield.BASE_SIZE.Y - hitObject.Y);
-
-            var slider = hitObject as Slider;
-            if (slider == null)
-                return;
-
-            var newControlPoints = new List<Vector2>();
-            slider.ControlPoints.ForEach(c => newControlPoints.Add(new Vector2(c.X, OsuPlayfield.BASE_SIZE.Y - c.Y)));
-
-            slider.ControlPoints = newControlPoints;
-            slider.Curve?.Calculate(); // Recalculate the slider curve
-        }
-    }
-
-    public class OsuModSuddenDeath : ModSuddenDeath
-    {
-        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModAutopilot) }).ToArray();
-    }
-
-    public class OsuModDaycore : ModDaycore
-    {
-        public override double ScoreMultiplier => 0.5;
-    }
-
-    public class OsuModDoubleTime : ModDoubleTime
-    {
-        public override double ScoreMultiplier => 1.12;
-    }
-
-    public class OsuModRelax : ModRelax
-    {
-        public override string Description => "You don't need to click.\nGive your clicking/tapping finger a break from the heat of things.";
-        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModAutopilot) }).ToArray();
-    }
-
-    public class OsuModHalfTime : ModHalfTime
-    {
-        public override double ScoreMultiplier => 0.5;
-    }
-
-    public class OsuModNightcore : ModNightcore
-    {
-        public override double ScoreMultiplier => 1.12;
-    }
-
-    public class OsuModFlashlight : ModFlashlight
-    {
-        public override double ScoreMultiplier => 1.12;
-    }
-
-    public class OsuModPerfect : ModPerfect
-    {
-    }
-
-    public class OsuModSpunOut : Mod
-    {
-        public override string Name => "Spun Out";
-        public override string ShortenedName => "SO";
-        public override FontAwesome Icon => FontAwesome.fa_osu_mod_spunout;
-        public override string Description => @"Spinners will be automatically completed";
-        public override double ScoreMultiplier => 0.9;
-        public override bool Ranked => true;
-        public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(OsuModAutopilot) };
-    }
-
-    public class OsuModAutopilot : Mod
-    {
-        public override string Name => "Autopilot";
-        public override string ShortenedName => "AP";
-        public override FontAwesome Icon => FontAwesome.fa_osu_mod_autopilot;
-        public override string Description => @"Automatic cursor movement - just follow the rhythm.";
-        public override double ScoreMultiplier => 0;
-        public override bool Ranked => false;
-        public override Type[] IncompatibleMods => new[] { typeof(OsuModSpunOut), typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModNoFail), typeof(ModAutoplay) };
-    }
-
-    public class OsuModAutoplay : ModAutoplay<OsuHitObject>
-    {
-        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModAutopilot), typeof(OsuModSpunOut) }).ToArray();
-
-        protected override Score CreateReplayScore(Beatmap<OsuHitObject> beatmap) => new Score
-        {
-            Replay = new OsuAutoGenerator(beatmap).Generate()
-        };
-    }
-
-    public class OsuModTarget : Mod
-    {
-        public override string Name => "Target";
-        public override string ShortenedName => "TP";
-        public override FontAwesome Icon => FontAwesome.fa_osu_mod_target;
-        public override string Description => @"";
-        public override double ScoreMultiplier => 1;
-    }
-}

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

@@ -0,0 +1,20 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Osu.Mods
+{
+    public class OsuModAutopilot : Mod
+    {
+        public override string Name => "Autopilot";
+        public override string ShortenedName => "AP";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_autopilot;
+        public override string Description => @"Automatic cursor movement - just follow the rhythm.";
+        public override double ScoreMultiplier => 0;
+        public override bool Ranked => false;
+        public override Type[] IncompatibleMods => new[] { typeof(OsuModSpunOut), typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModNoFail), typeof(ModAutoplay) };
+    }
+}

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

@@ -0,0 +1,26 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Replays;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Osu.Mods
+{
+    public class OsuModAutoplay : ModAutoplay<OsuHitObject>
+    {
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModAutopilot), typeof(OsuModSpunOut) }).ToArray();
+
+        protected override Score CreateReplayScore(Beatmap<OsuHitObject> beatmap)
+        {
+            return new Score
+            {
+                Replay = new OsuAutoGenerator(beatmap).Generate()
+            };
+        }
+    }
+}

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

@@ -0,0 +1,12 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Osu.Mods
+{
+    public class OsuModDaycore : ModDaycore
+    {
+        public override double ScoreMultiplier => 0.5;
+    }
+}

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

@@ -0,0 +1,12 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Osu.Mods
+{
+    public class OsuModDoubleTime : ModDoubleTime
+    {
+        public override double ScoreMultiplier => 1.12;
+    }
+}

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

@@ -0,0 +1,11 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Osu.Mods
+{
+    public class OsuModEasy : ModEasy
+    {
+    }
+}

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

@@ -0,0 +1,12 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Osu.Mods
+{
+    public class OsuModFlashlight : ModFlashlight
+    {
+        public override double ScoreMultiplier => 1.12;
+    }
+}

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

@@ -0,0 +1,12 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Osu.Mods
+{
+    public class OsuModHalfTime : ModHalfTime
+    {
+        public override double ScoreMultiplier => 0.5;
+    }
+}

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

@@ -0,0 +1,32 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Collections.Generic;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.UI;
+using OpenTK;
+
+namespace osu.Game.Rulesets.Osu.Mods
+{
+    public class OsuModHardRock : ModHardRock, IApplicableToHitObject<OsuHitObject>
+    {
+        public override double ScoreMultiplier => 1.06;
+        public override bool Ranked => true;
+
+        public void ApplyToHitObject(OsuHitObject hitObject)
+        {
+            hitObject.Position = new Vector2(hitObject.Position.X, OsuPlayfield.BASE_SIZE.Y - hitObject.Y);
+
+            var slider = hitObject as Slider;
+            if (slider == null)
+                return;
+
+            var newControlPoints = new List<Vector2>();
+            slider.ControlPoints.ForEach(c => newControlPoints.Add(new Vector2(c.X, OsuPlayfield.BASE_SIZE.Y - c.Y)));
+
+            slider.ControlPoints = newControlPoints;
+            slider.Curve?.Calculate(); // Recalculate the slider curve
+        }
+    }
+}

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

@@ -0,0 +1,79 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Osu.Mods
+{
+    public class OsuModHidden : ModHidden, IApplicableToDrawableHitObjects
+    {
+        public override string Description => @"Play with no approach circles and fading notes for a slight score advantage.";
+        public override double ScoreMultiplier => 1.06;
+
+        private const double fade_in_duration_multiplier = 0.4;
+        private const double fade_out_duration_multiplier = 0.3;
+
+        private float preEmpt => DrawableOsuHitObject.TIME_PREEMPT;
+
+        public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
+        {
+            foreach (var d in drawables.OfType<DrawableOsuHitObject>())
+            {
+                d.ApplyCustomUpdateState += ApplyHiddenState;
+                d.FadeInDuration = preEmpt * fade_in_duration_multiplier;
+            }
+        }
+
+        protected void ApplyHiddenState(DrawableHitObject drawable, ArmedState state)
+        {
+            if (!(drawable is DrawableOsuHitObject d))
+                return;
+
+            var fadeOutStartTime = d.HitObject.StartTime - preEmpt + d.FadeInDuration;
+            var fadeOutDuration = preEmpt * fade_out_duration_multiplier;
+
+            // new duration from completed fade in to end (before fading out)
+            var longFadeDuration = ((d.HitObject as IHasEndTime)?.EndTime ?? d.HitObject.StartTime) - fadeOutStartTime;
+
+            switch (drawable)
+            {
+                case DrawableHitCircle circle:
+                    // we don't want to see the approach circle
+                    circle.ApproachCircle.Hide();
+
+                    // fade out immediately after fade in.
+                    using (drawable.BeginAbsoluteSequence(fadeOutStartTime, true))
+                    {
+                        circle.FadeOut(fadeOutDuration);
+                    }
+
+                    break;
+                case DrawableSlider slider:
+                    using (slider.BeginAbsoluteSequence(fadeOutStartTime, true))
+                    {
+                        slider.Body.FadeOut(longFadeDuration, Easing.Out);
+                    }
+
+                    break;
+                case DrawableSpinner spinner:
+                    // hide elements we don't care about.
+                    spinner.Disc.Hide();
+                    spinner.Ticks.Hide();
+                    spinner.Background.Hide();
+
+                    using (spinner.BeginAbsoluteSequence(fadeOutStartTime + longFadeDuration, true))
+                    {
+                        spinner.FadeOut(fadeOutDuration);
+                    }
+
+                    break;
+            }
+        }
+    }
+}

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

@@ -0,0 +1,12 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Osu.Mods
+{
+    public class OsuModNightcore : ModNightcore
+    {
+        public override double ScoreMultiplier => 1.12;
+    }
+}

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

@@ -0,0 +1,14 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Linq;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Osu.Mods
+{
+    public class OsuModNoFail : ModNoFail
+    {
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModAutopilot) }).ToArray();
+    }
+}

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

@@ -0,0 +1,11 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Osu.Mods
+{
+    public class OsuModPerfect : ModPerfect
+    {
+    }
+}

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

@@ -0,0 +1,15 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Linq;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Osu.Mods
+{
+    public class OsuModRelax : ModRelax
+    {
+        public override string Description => "You don't need to click.\nGive your clicking/tapping finger a break from the heat of things.";
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModAutopilot) }).ToArray();
+    }
+}

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

@@ -0,0 +1,20 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Osu.Mods
+{
+    public class OsuModSpunOut : Mod
+    {
+        public override string Name => "Spun Out";
+        public override string ShortenedName => "SO";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_spunout;
+        public override string Description => @"Spinners will be automatically completed";
+        public override double ScoreMultiplier => 0.9;
+        public override bool Ranked => true;
+        public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(OsuModAutopilot) };
+    }
+}

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

@@ -0,0 +1,14 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Linq;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Osu.Mods
+{
+    public class OsuModSuddenDeath : ModSuddenDeath
+    {
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModAutopilot) }).ToArray();
+    }
+}

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

@@ -0,0 +1,17 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Osu.Mods
+{
+    public class OsuModTarget : Mod
+    {
+        public override string Name => "Target";
+        public override string ShortenedName => "TP";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_target;
+        public override string Description => @"";
+        public override double ScoreMultiplier => 1;
+    }
+}

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

@@ -51,6 +51,21 @@
     <Compile Include="Edit\OsuEditPlayfield.cs" />
     <Compile Include="Edit\OsuEditRulesetContainer.cs" />
     <Compile Include="Edit\OsuHitObjectComposer.cs" />
+    <Compile Include="Mods\OsuModAutopilot.cs" />
+    <Compile Include="Mods\OsuModAutoplay.cs" />
+    <Compile Include="Mods\OsuModDaycore.cs" />
+    <Compile Include="Mods\OsuModDoubleTime.cs" />
+    <Compile Include="Mods\OsuModEasy.cs" />
+    <Compile Include="Mods\OsuModFlashlight.cs" />
+    <Compile Include="Mods\OsuModHalfTime.cs" />
+    <Compile Include="Mods\OsuModHardRock.cs" />
+    <Compile Include="Mods\OsuModHidden.cs" />
+    <Compile Include="Mods\OsuModNightcore.cs" />
+    <Compile Include="Mods\OsuModPerfect.cs" />
+    <Compile Include="Mods\OsuModRelax.cs" />
+    <Compile Include="Mods\OsuModSpunOut.cs" />
+    <Compile Include="Mods\OsuModSuddenDeath.cs" />
+    <Compile Include="Mods\OsuModTarget.cs" />
     <Compile Include="Objects\Drawables\DrawableOsuHitObject.cs" />
     <Compile Include="Objects\Drawables\Connections\ConnectionRenderer.cs" />
     <Compile Include="Objects\Drawables\Connections\FollowPointRenderer.cs" />
@@ -108,7 +123,7 @@
     <Compile Include="Objects\Slider.cs" />
     <Compile Include="Objects\Spinner.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Mods\OsuMod.cs" />
+    <Compile Include="Mods\OsuModNoFail.cs" />
     <Compile Include="Replays\OsuAutoGenerator.cs" />
     <Compile Include="Replays\OsuAutoGeneratorBase.cs" />
   </ItemGroup>

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

@@ -1,83 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Rulesets.Taiko.Objects;
-using osu.Game.Rulesets.Taiko.Replays;
-using osu.Game.Users;
-
-namespace osu.Game.Rulesets.Taiko.Mods
-{
-    public class TaikoModNoFail : ModNoFail
-    {
-
-    }
-
-    public class TaikoModEasy : ModEasy
-    {
-
-    }
-
-    public class TaikoModHidden : ModHidden
-    {
-        public override string Description => @"The notes fade out before you hit them!";
-        public override double ScoreMultiplier => 1.06;
-    }
-
-    public class TaikoModHardRock : ModHardRock
-    {
-        public override double ScoreMultiplier => 1.06;
-        public override bool Ranked => true;
-    }
-
-    public class TaikoModSuddenDeath : ModSuddenDeath
-    {
-
-    }
-
-    public class TaikoModDaycore : ModDaycore
-    {
-        public override double ScoreMultiplier => 0.5;
-    }
-
-    public class TaikoModDoubleTime : ModDoubleTime
-    {
-        public override double ScoreMultiplier => 1.12;
-    }
-
-    public class TaikoModRelax : ModRelax
-    {
-        public override string Description => @"Relax! You will no longer get dizzyfied by ninja-like spinners, demanding drumrolls or unexpected katu's.";
-    }
-
-    public class TaikoModHalfTime : ModHalfTime
-    {
-        public override double ScoreMultiplier => 0.5;
-    }
-
-    public class TaikoModNightcore : ModNightcore
-    {
-        public override double ScoreMultiplier => 1.12;
-    }
-
-    public class TaikoModFlashlight : ModFlashlight
-    {
-        public override double ScoreMultiplier => 1.12;
-    }
-
-    public class TaikoModPerfect : ModPerfect
-    {
-
-    }
-
-    public class TaikoModAutoplay : ModAutoplay<TaikoHitObject>
-    {
-        protected override Score CreateReplayScore(Beatmap<TaikoHitObject> beatmap) => new Score
-        {
-            User = new User { Username = "mekkadosu!" },
-            Replay = new TaikoAutoGenerator(beatmap).Generate(),
-        };
-    }
-}

osu.Game.Rulesets.Taiko/Mods/TaikoModAutoplay.cs

@@ -0,0 +1,24 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Replays;
+using osu.Game.Users;
+
+namespace osu.Game.Rulesets.Taiko.Mods
+{
+    public class TaikoModAutoplay : ModAutoplay<TaikoHitObject>
+    {
+        protected override Score CreateReplayScore(Beatmap<TaikoHitObject> beatmap)
+        {
+            return new Score
+            {
+                User = new User { Username = "mekkadosu!" },
+                Replay = new TaikoAutoGenerator(beatmap).Generate(),
+            };
+        }
+    }
+}

osu.Game.Rulesets.Taiko/Mods/TaikoModDaycore.cs

@@ -0,0 +1,12 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Taiko.Mods
+{
+    public class TaikoModDaycore : ModDaycore
+    {
+        public override double ScoreMultiplier => 0.5;
+    }
+}

osu.Game.Rulesets.Taiko/Mods/TaikoModDoubleTime.cs

@@ -0,0 +1,12 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Taiko.Mods
+{
+    public class TaikoModDoubleTime : ModDoubleTime
+    {
+        public override double ScoreMultiplier => 1.12;
+    }
+}

osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs

@@ -0,0 +1,11 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Taiko.Mods
+{
+    public class TaikoModEasy : ModEasy
+    {
+    }
+}

osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs

@@ -0,0 +1,12 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Taiko.Mods
+{
+    public class TaikoModFlashlight : ModFlashlight
+    {
+        public override double ScoreMultiplier => 1.12;
+    }
+}

osu.Game.Rulesets.Taiko/Mods/TaikoModHalfTime.cs

@@ -0,0 +1,12 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Taiko.Mods
+{
+    public class TaikoModHalfTime : ModHalfTime
+    {
+        public override double ScoreMultiplier => 0.5;
+    }
+}

osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs

@@ -0,0 +1,13 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Taiko.Mods
+{
+    public class TaikoModHardRock : ModHardRock
+    {
+        public override double ScoreMultiplier => 1.06;
+        public override bool Ranked => true;
+    }
+}

osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs

@@ -0,0 +1,13 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Taiko.Mods
+{
+    public class TaikoModHidden : ModHidden
+    {
+        public override string Description => @"The notes fade out before you hit them!";
+        public override double ScoreMultiplier => 1.06;
+    }
+}

osu.Game.Rulesets.Taiko/Mods/TaikoModNightcore.cs

@@ -0,0 +1,12 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Taiko.Mods
+{
+    public class TaikoModNightcore : ModNightcore
+    {
+        public override double ScoreMultiplier => 1.12;
+    }
+}

osu.Game.Rulesets.Taiko/Mods/TaikoModNoFail.cs

@@ -0,0 +1,11 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Taiko.Mods
+{
+    public class TaikoModNoFail : ModNoFail
+    {
+    }
+}

osu.Game.Rulesets.Taiko/Mods/TaikoModPerfect.cs

@@ -0,0 +1,11 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Taiko.Mods
+{
+    public class TaikoModPerfect : ModPerfect
+    {
+    }
+}

osu.Game.Rulesets.Taiko/Mods/TaikoModRelax.cs

@@ -0,0 +1,12 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Taiko.Mods
+{
+    public class TaikoModRelax : ModRelax
+    {
+        public override string Description => @"Relax! You will no longer get dizzyfied by ninja-like spinners, demanding drumrolls or unexpected katu's.";
+    }
+}

osu.Game.Rulesets.Taiko/Mods/TaikoModSuddenDeath.cs

@@ -0,0 +1,11 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Taiko.Mods
+{
+    public class TaikoModSuddenDeath : ModSuddenDeath
+    {
+    }
+}

osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj

@@ -49,6 +49,18 @@
     <Compile Include="Judgements\TaikoDrumRollTickJudgement.cs" />
     <Compile Include="Judgements\TaikoStrongHitJudgement.cs" />
     <Compile Include="Judgements\TaikoJudgement.cs" />
+    <Compile Include="Mods\TaikoModAutoplay.cs" />
+    <Compile Include="Mods\TaikoModDaycore.cs" />
+    <Compile Include="Mods\TaikoModDoubleTime.cs" />
+    <Compile Include="Mods\TaikoModEasy.cs" />
+    <Compile Include="Mods\TaikoModFlashlight.cs" />
+    <Compile Include="Mods\TaikoModHalfTime.cs" />
+    <Compile Include="Mods\TaikoModHardRock.cs" />
+    <Compile Include="Mods\TaikoModHidden.cs" />
+    <Compile Include="Mods\TaikoModNightcore.cs" />
+    <Compile Include="Mods\TaikoModPerfect.cs" />
+    <Compile Include="Mods\TaikoModRelax.cs" />
+    <Compile Include="Mods\TaikoModSuddenDeath.cs" />
     <Compile Include="Objects\BarLine.cs" />
     <Compile Include="Objects\Drawables\DrawableBarLine.cs" />
     <Compile Include="Objects\Drawables\DrawableBarLineMajor.cs" />
@@ -94,7 +106,7 @@
     <Compile Include="UI\TaikoRulesetContainer.cs" />
     <Compile Include="UI\TaikoPlayfield.cs" />
     <Compile Include="TaikoRuleset.cs" />
-    <Compile Include="Mods\TaikoMod.cs" />
+    <Compile Include="Mods\TaikoModNoFail.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />

osu.Game.Tests/Visual/TestCaseBeatmapCarousel.cs

@@ -128,6 +128,20 @@ namespace osu.Game.Tests.Visual
             selectedSets.Pop();
         });
 
+        private bool selectedBeatmapVisible()
+        {
+            var currentlySelected = carousel.Items.FirstOrDefault(s => s.Item is CarouselBeatmap && s.Item.State == CarouselItemState.Selected);
+            if (currentlySelected == null)
+                return true;
+            return currentlySelected.Item.Visible;
+        }
+
+        private void checkInvisibleDifficultiesUnselectable()
+        {
+            nextRandom();
+            AddAssert("Selection is visible", selectedBeatmapVisible);
+        }
+
         /// <summary>
         /// Test keyboard traversal
         /// </summary>
@@ -222,6 +236,15 @@ namespace osu.Game.Tests.Visual
 
             nextRandom();
             AddAssert("ensure repeat", () => selectedSets.Contains(carousel.SelectedBeatmapSet));
+
+            AddStep("Add set with 100 difficulties", () => carousel.UpdateBeatmapSet(createTestBeatmapSetWithManyDifficulties(set_count + 1)));
+            AddStep("Filter Extra", () => carousel.Filter(new FilterCriteria { SearchText = "Extra 10" }, false));
+            checkInvisibleDifficultiesUnselectable();
+            checkInvisibleDifficultiesUnselectable();
+            checkInvisibleDifficultiesUnselectable();
+            checkInvisibleDifficultiesUnselectable();
+            checkInvisibleDifficultiesUnselectable();
+            AddStep("Un-filter", () => carousel.Filter(new FilterCriteria(), false));
         }
 
         /// <summary>
@@ -330,26 +353,26 @@ namespace osu.Game.Tests.Visual
             }
         }
 
-        private BeatmapSetInfo createTestBeatmapSet(int i)
+        private BeatmapSetInfo createTestBeatmapSet(int id)
         {
             return new BeatmapSetInfo
             {
-                ID = i,
+                ID = id,
-                OnlineBeatmapSetID = i,
+                OnlineBeatmapSetID = id,
                 Hash = new MemoryStream(Encoding.UTF8.GetBytes(Guid.NewGuid().ToString())).ComputeMD5Hash(),
                 Metadata = new BeatmapMetadata
                 {
-                    OnlineBeatmapSetID = i,
+                    OnlineBeatmapSetID = id,
                     // Create random metadata, then we can check if sorting works based on these
-                    Artist = $"peppy{i.ToString().PadLeft(6, '0')}",
+                    Artist = $"peppy{id.ToString().PadLeft(6, '0')}",
-                    Title = $"test set #{i}!",
+                    Title = $"test set #{id}!",
-                    AuthorString = string.Concat(Enumerable.Repeat((char)('z' - Math.Min(25, i - 1)), 5))
+                    AuthorString = string.Concat(Enumerable.Repeat((char)('z' - Math.Min(25, id - 1)), 5))
                 },
                 Beatmaps = new List<BeatmapInfo>(new[]
                 {
                     new BeatmapInfo
                     {
-                        OnlineBeatmapID = i * 10,
+                        OnlineBeatmapID = id * 10,
                         Path = "normal.osu",
                         Version = "Normal",
                         StarDifficulty = 2,
@@ -360,7 +383,7 @@ namespace osu.Game.Tests.Visual
                     },
                     new BeatmapInfo
                     {
-                        OnlineBeatmapID = i * 10 + 1,
+                        OnlineBeatmapID = id * 10 + 1,
                         Path = "hard.osu",
                         Version = "Hard",
                         StarDifficulty = 5,
@@ -371,7 +394,7 @@ namespace osu.Game.Tests.Visual
                     },
                     new BeatmapInfo
                     {
-                        OnlineBeatmapID = i * 10 + 2,
+                        OnlineBeatmapID = id * 10 + 2,
                         Path = "insane.osu",
                         Version = "Insane",
                         StarDifficulty = 6,
@@ -384,6 +407,40 @@ namespace osu.Game.Tests.Visual
             };
         }
 
+        private BeatmapSetInfo createTestBeatmapSetWithManyDifficulties(int id)
+        {
+            var toReturn = new BeatmapSetInfo
+            {
+                ID = id,
+                OnlineBeatmapSetID = id,
+                Hash = new MemoryStream(Encoding.UTF8.GetBytes(Guid.NewGuid().ToString())).ComputeMD5Hash(),
+                Metadata = new BeatmapMetadata
+                {
+                    OnlineBeatmapSetID = id,
+                    // Create random metadata, then we can check if sorting works based on these
+                    Artist = $"peppy{id.ToString().PadLeft(6, '0')}",
+                    Title = $"test set #{id}!",
+                    AuthorString = string.Concat(Enumerable.Repeat((char)('z' - Math.Min(25, id - 1)), 5))
+                },
+                Beatmaps = new List<BeatmapInfo>(),
+            };
+            for (int b = 1; b < 101; b++)
+            {
+                toReturn.Beatmaps.Add(new BeatmapInfo
+                {
+                    OnlineBeatmapID = b * 10,
+                    Path = $"extra{b}.osu",
+                    Version = $"Extra {b}",
+                    StarDifficulty = 2,
+                    BaseDifficulty = new BeatmapDifficulty
+                    {
+                        OverallDifficulty = 3.5f,
+                    }
+                });
+            }
+            return toReturn;
+        }
+
         private class TestBeatmapCarousel : BeatmapCarousel
         {
             public new List<DrawableCarouselItem> Items => base.Items;

osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs

@@ -8,7 +8,6 @@ using OpenTK.Graphics;
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Beatmaps.ControlPoints;
-using System.Collections.Generic;
 
 namespace osu.Game.Beatmaps.Formats
 {
@@ -82,15 +81,12 @@ namespace osu.Game.Beatmaps.Formats
                 case Section.HitObjects:
                     handleHitObjects(line);
                     break;
-                case Section.Variables:
-                    handleVariables(line);
-                    break;
             }
         }
 
         private void handleGeneral(string line)
         {
-            var pair = splitKeyVal(line, ':');
+            var pair = SplitKeyVal(line, ':');
 
             var metadata = beatmap.BeatmapInfo.Metadata;
             switch (pair.Key)
@@ -149,7 +145,7 @@ namespace osu.Game.Beatmaps.Formats
 
         private void handleEditor(string line)
         {
-            var pair = splitKeyVal(line, ':');
+            var pair = SplitKeyVal(line, ':');
 
             switch (pair.Key)
             {
@@ -173,7 +169,7 @@ namespace osu.Game.Beatmaps.Formats
 
         private void handleMetadata(string line)
         {
-            var pair = splitKeyVal(line, ':');
+            var pair = SplitKeyVal(line, ':');
 
             var metadata = beatmap.BeatmapInfo.Metadata;
             switch (pair.Key)
@@ -214,7 +210,7 @@ namespace osu.Game.Beatmaps.Formats
 
         private void handleDifficulty(string line)
         {
-            var pair = splitKeyVal(line, ':');
+            var pair = SplitKeyVal(line, ':');
 
             var difficulty = beatmap.BeatmapInfo.BaseDifficulty;
             switch (pair.Key)
@@ -242,8 +238,6 @@ namespace osu.Game.Beatmaps.Formats
 
         private void handleEvents(string line)
         {
-            DecodeVariables(ref line);
-
             string[] split = line.Split(',');
 
             EventType type;
@@ -359,7 +353,7 @@ namespace osu.Game.Beatmaps.Formats
 
         private void handleColours(string line)
         {
-            var pair = splitKeyVal(line, ':');
+            var pair = SplitKeyVal(line, ':');
 
             string[] split = pair.Value.Split(',');
 
@@ -400,22 +394,5 @@ namespace osu.Game.Beatmaps.Formats
             if (obj != null)
                 beatmap.HitObjects.Add(obj);
         }
-
-        private void handleVariables(string line)
-        {
-            var pair = splitKeyVal(line, '=');
-            Variables[pair.Key] = pair.Value;
-        }
-
-        private KeyValuePair<string, string> splitKeyVal(string line, char separator)
-        {
-            var split = line.Trim().Split(new[] { separator }, 2);
-
-            return new KeyValuePair<string, string>
-            (
-                split[0].Trim(),
-                split.Length > 1 ? split[1].Trim() : string.Empty
-            );
-        }
     }
 }

osu.Game/Beatmaps/Formats/LegacyDecoder.cs

@@ -29,7 +29,6 @@ namespace osu.Game.Beatmaps.Formats
         }
 
         protected int BeatmapVersion;
-        protected readonly Dictionary<string, string> Variables = new Dictionary<string, string>();
 
         public override Decoder GetStoryboardDecoder() => new LegacyStoryboardDecoder(BeatmapVersion);
 
@@ -82,27 +81,15 @@ namespace osu.Game.Beatmaps.Formats
 
         protected abstract void ProcessSection(Section section, string line);
 
-        /// <summary>
+        protected KeyValuePair<string, string> SplitKeyVal(string line, char separator)
-        /// Decodes any beatmap variables present in a line into their real values.
-        /// </summary>
-        /// <param name="line">The line which may contains variables.</param>
-        protected void DecodeVariables(ref string line)
         {
-            while (line.IndexOf('$') >= 0)
+            var split = line.Trim().Split(new[] { separator }, 2);
-            {
-                string origLine = line;
-                string[] split = line.Split(',');
-                for (int i = 0; i < split.Length; i++)
-                {
-                    var item = split[i];
-                    if (item.StartsWith("$") && Variables.ContainsKey(item))
-                        split[i] = Variables[item];
-                }
 
-                line = string.Join(",", split);
+            return new KeyValuePair<string, string>
-                if (line == origLine)
+            (
-                    break;
+                split[0].Trim(),
-            }
+                split.Length > 1 ? split[1].Trim() : string.Empty
+            );
         }
 
         protected enum Section

osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using OpenTK;
@@ -19,6 +20,8 @@ namespace osu.Game.Beatmaps.Formats
         private StoryboardSprite storyboardSprite;
         private CommandTimelineGroup timelineGroup;
 
+        private readonly Dictionary<string, string> variables = new Dictionary<string, string>();
+
         public LegacyStoryboardDecoder()
         {
         }
@@ -47,6 +50,9 @@ namespace osu.Game.Beatmaps.Formats
                 case Section.Events:
                     handleEvents(line);
                     break;
+                case Section.Variables:
+                    handleVariables(line);
+                    break;
             }
         }
 
@@ -59,7 +65,7 @@ namespace osu.Game.Beatmaps.Formats
                 line = line.Substring(1);
             }
 
-            DecodeVariables(ref line);
+            decodeVariables(ref line);
 
             string[] split = line.Split(',');
 
@@ -266,6 +272,35 @@ namespace osu.Game.Beatmaps.Formats
             throw new InvalidDataException($@"Unknown origin: {value}");
         }
 
+        private void handleVariables(string line)
+        {
+            var pair = SplitKeyVal(line, '=');
+            variables[pair.Key] = pair.Value;
+        }
+
+        /// <summary>
+        /// Decodes any beatmap variables present in a line into their real values.
+        /// </summary>
+        /// <param name="line">The line which may contains variables.</param>
+        private void decodeVariables(ref string line)
+        {
+            while (line.IndexOf('$') >= 0)
+            {
+                string origLine = line;
+                string[] split = line.Split(',');
+                for (int i = 0; i < split.Length; i++)
+                {
+                    var item = split[i];
+                    if (item.StartsWith("$") && variables.ContainsKey(item))
+                        split[i] = variables[item];
+                }
+
+                line = string.Join(",", split);
+                if (line == origLine)
+                    break;
+            }
+        }
+
         private string cleanFilename(string path) => FileSafety.PathSanitise(path.Trim('\"'));
     }
 }

osu.Game/Input/Bindings/GlobalKeyBindingInputManager.cs

@@ -20,7 +20,9 @@ namespace osu.Game.Input.Bindings
                 handler = game;
         }
 
-        public override IEnumerable<KeyBinding> DefaultKeyBindings => new[]
+        public override IEnumerable<KeyBinding> DefaultKeyBindings => GlobalKeyBindings.Concat(InGameKeyBindings);
+
+        public IEnumerable<KeyBinding> GlobalKeyBindings => new[]
         {
             new KeyBinding(InputKey.F8, GlobalAction.ToggleChat),
             new KeyBinding(InputKey.F9, GlobalAction.ToggleSocial),
@@ -33,6 +35,11 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.MouseWheelDown }, GlobalAction.DecreaseVolume),
         };
 
+        public IEnumerable<KeyBinding> InGameKeyBindings => new[]
+        {
+            new KeyBinding(InputKey.Space, GlobalAction.SkipCutscene)
+        };
+
         protected override IEnumerable<Drawable> KeyBindingInputQueue =>
             handler == null ? base.KeyBindingInputQueue : new[] { handler }.Concat(base.KeyBindingInputQueue);
     }
@@ -55,5 +62,9 @@ namespace osu.Game.Input.Bindings
         IncreaseVolume,
         [Description("Decrease Volume")]
         DecreaseVolume,
+
+        // In-Game Keybindings
+        [Description("Skip Cutscene")]
+        SkipCutscene
     }
 }

osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs

@@ -1,8 +1,8 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Input.Bindings;
 using osu.Game.Graphics;
+using osu.Game.Input.Bindings;
 using osu.Game.Overlays.Settings;
 
 namespace osu.Game.Overlays.KeyBinding
@@ -12,19 +12,31 @@ namespace osu.Game.Overlays.KeyBinding
         public override FontAwesome Icon => FontAwesome.fa_osu_hot;
         public override string Header => "Global";
 
-        public GlobalKeyBindingsSection(KeyBindingContainer manager)
+        public GlobalKeyBindingsSection(GlobalKeyBindingInputManager manager)
         {
             Add(new DefaultBindingsSubsection(manager));
+            Add(new InGameKeyBindingsSubsection(manager));
         }
 
+
         private class DefaultBindingsSubsection : KeyBindingsSubsection
         {
             protected override string Header => string.Empty;
 
-            public DefaultBindingsSubsection(KeyBindingContainer manager)
+            public DefaultBindingsSubsection(GlobalKeyBindingInputManager manager)
                 : base(null)
             {
-                Defaults = manager.DefaultKeyBindings;
+                Defaults = manager.GlobalKeyBindings;
+            }
+        }
+
+        private class InGameKeyBindingsSubsection : KeyBindingsSubsection
+        {
+            protected override string Header => "In Game";
+
+            public InGameKeyBindingsSubsection(GlobalKeyBindingInputManager manager) : base(null)
+            {
+                Defaults = manager.InGameKeyBindings;
             }
         }
     }

osu.Game/Screens/Play/SkipButton.cs

@@ -14,13 +14,14 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Screens.Ranking;
 using OpenTK;
 using OpenTK.Graphics;
-using OpenTK.Input;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics.Containers;
+using osu.Framework.Input.Bindings;
+using osu.Game.Input.Bindings;
 
 namespace osu.Game.Screens.Play
 {
-    public class SkipButton : Container
+    public class SkipButton : Container, IKeyBindingHandler<GlobalAction>
     {
         private readonly double startTime;
         public IAdjustableClock AudioClock;
@@ -117,20 +118,20 @@ namespace osu.Game.Screens.Play
             remainingTimeBox.ResizeWidthTo((float)Math.Max(0, 1 - (Time.Current - displayTime) / (beginFadeTime - displayTime)), 120, Easing.OutQuint);
         }
 
-        protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
+        public bool OnPressed(GlobalAction action)
         {
-            if (args.Repeat) return false;
+            switch (action)
-
-            switch (args.Key)
             {
-                case Key.Space:
+                case GlobalAction.SkipCutscene:
                     button.TriggerOnClick();
                     return true;
             }
 
-            return base.OnKeyDown(state, args);
+            return false;
         }
 
+        public bool OnReleased(GlobalAction action) => false;
+
         private class FadeContainer : Container, IStateful<Visibility>
         {
             public event Action<Visibility> StateChanged;

osu.Game/Screens/Select/BeatmapCarousel.cs

@@ -235,8 +235,8 @@ namespace osu.Game.Screens.Select
         /// <returns>True if a selection could be made, else False.</returns>
         public bool SelectNextRandom()
         {
-            var visible = beatmapSets.Where(s => !s.Filtered).ToList();
+            var visibleSets = beatmapSets.Where(s => !s.Filtered).ToList();
-            if (!visible.Any())
+            if (!visibleSets.Any())
                 return false;
 
             if (selectedBeatmap != null)
@@ -253,20 +253,21 @@ namespace osu.Game.Screens.Select
 
             if (RandomAlgorithm == RandomSelectAlgorithm.RandomPermutation)
             {
-                var notYetVisitedSets = visible.Except(previouslyVisitedRandomSets).ToList();
+                var notYetVisitedSets = visibleSets.Except(previouslyVisitedRandomSets).ToList();
                 if (!notYetVisitedSets.Any())
                 {
-                    previouslyVisitedRandomSets.Clear();
+                    previouslyVisitedRandomSets.RemoveAll(s => visibleSets.Contains(s));
-                    notYetVisitedSets = visible;
+                    notYetVisitedSets = visibleSets;
                 }
 
                 set = notYetVisitedSets.ElementAt(RNG.Next(notYetVisitedSets.Count));
                 previouslyVisitedRandomSets.Add(set);
             }
             else
-                set = visible.ElementAt(RNG.Next(visible.Count));
+                set = visibleSets.ElementAt(RNG.Next(visibleSets.Count));
 
-            select(set.Beatmaps.Skip(RNG.Next(set.Beatmaps.Count())).FirstOrDefault());
+            var visibleBeatmaps = set.Beatmaps.Where(s => !s.Filtered).ToList();
+            select(visibleBeatmaps[RNG.Next(visibleBeatmaps.Count)]);
             return true;
         }
 

osu.Game/Screens/Select/Leaderboards/Leaderboard.cs

@@ -93,7 +93,8 @@ namespace osu.Game.Screens.Select.Leaderboards
             get { return scope; }
             set
             {
-                if (value == scope) return;
+                if (value == scope)
+                    return;
 
                 scope = value;
                 updateScores();
@@ -107,8 +108,6 @@ namespace osu.Game.Screens.Select.Leaderboards
             get { return placeholderState; }
             set
             {
-                if (value == placeholderState) return;
-
                 if (value != PlaceholderState.Successful)
                 {
                     getScoresRequest?.Cancel();
@@ -116,6 +115,9 @@ namespace osu.Game.Screens.Select.Leaderboards
                     Scores = null;
                 }
 
+                if (value == placeholderState)
+                    return;
+
                 switch (placeholderState = value)
                 {
                     case PlaceholderState.NetworkFailure:
@@ -171,7 +173,8 @@ namespace osu.Game.Screens.Select.Leaderboards
             get { return beatmap; }
             set
             {
-                if (beatmap == value) return;
+                if (beatmap == value)
+                    return;
 
                 beatmap = value;
                 Scores = null;
@@ -259,7 +262,8 @@ namespace osu.Game.Screens.Select.Leaderboards
 
         private void onUpdateFailed(Exception e)
         {
-            if (e is OperationCanceledException) return;
+            if (e is OperationCanceledException)
+                return;
 
             PlaceholderState = PlaceholderState.NetworkFailure;
             Logger.Error(e, @"Couldn't fetch beatmap scores!");
@@ -294,7 +298,8 @@ namespace osu.Game.Screens.Select.Leaderboards
             if (!scrollContainer.IsScrolledToEnd())
                 fadeStart -= LeaderboardScore.HEIGHT;
 
-            if (scrollFlow == null) return;
+            if (scrollFlow == null)
+                return;
 
             foreach (var c in scrollFlow.Children)
             {