Merge branch 'master' into drawable-composite-hit-object

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

@@ -7,6 +7,6 @@ namespace osu.Game.Rulesets.Catch.Mods
 {
     public class CatchModDaycore : ModDaycore
     {
-        public override double ScoreMultiplier => 0.5;
+        public override double ScoreMultiplier => 0.3;
     }
 }

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

@@ -7,5 +7,6 @@ namespace osu.Game.Rulesets.Catch.Mods
 {
     public class CatchModEasy : ModEasy
     {
+        public override string Description => @"Larger fruits, more forgiving HP drain, less accuracy required, and three lives!";
     }
 }

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

@@ -7,6 +7,6 @@ namespace osu.Game.Rulesets.Catch.Mods
 {
     public class CatchModHalfTime : ModHalfTime
     {
-        public override double ScoreMultiplier => 0.5;
+        public override double ScoreMultiplier => 0.3;
     }
 }

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

@@ -8,6 +8,5 @@ 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

@@ -7,7 +7,7 @@ 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 string Description => @"Play with fading fruits.";
         public override double ScoreMultiplier => 1.06;
     }
 }

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

@@ -7,6 +7,6 @@ namespace osu.Game.Rulesets.Mania.Mods
 {
     public class ManiaModDaycore : ModDaycore
     {
-        public override double ScoreMultiplier => 0.3;
+        public override double ScoreMultiplier => 0.5;
     }
 }

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

@@ -7,6 +7,6 @@ namespace osu.Game.Rulesets.Mania.Mods
 {
     public class ManiaModDoubleTime : ModDoubleTime
     {
-        public override double ScoreMultiplier => 1.0;
+        public override double ScoreMultiplier => 1;
     }
 }

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

@@ -16,8 +16,7 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override string Name => "Dual Stages";
         public override string ShortenedName => "DS";
         public override string Description => @"Double the stages, double the fun!";
-        public override double ScoreMultiplier => 1;
-        public override bool Ranked => false;
+        public override double ScoreMultiplier => 0;
 
         public void ApplyToBeatmapConverter(BeatmapConverter<ManiaHitObject> beatmapConverter)
         {

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

@@ -7,5 +7,6 @@ namespace osu.Game.Rulesets.Mania.Mods
 {
     public class ManiaModEasy : ModEasy
     {
+        public override string Description => @"More forgiving HP drain, less accuracy required, and three lives!";
     }
 }

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

@@ -9,10 +9,11 @@ namespace osu.Game.Rulesets.Mania.Mods
 {
     public class ManiaModFadeIn : Mod
     {
-        public override string Name => "FadeIn";
+        public override string Name => "Fade In";
         public override string ShortenedName => "FI";
         public override FontAwesome Icon => FontAwesome.fa_osu_mod_hidden;
         public override ModType Type => ModType.DifficultyIncrease;
+        public override string Description => @"Keys appear out of nowhere!";
         public override double ScoreMultiplier => 1;
         public override bool Ranked => true;
         public override Type[] IncompatibleMods => new[] { typeof(ModFlashlight) };

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

@@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Mania.Mods
 {
     public class ManiaModFlashlight : ModFlashlight
     {
-        public override double ScoreMultiplier => 1.0;
+        public override double ScoreMultiplier => 1;
         public override Type[] IncompatibleMods => new[] { typeof(ModHidden) };
     }
 }

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

@@ -7,6 +7,6 @@ namespace osu.Game.Rulesets.Mania.Mods
 {
     public class ManiaModHalfTime : ModHalfTime
     {
-        public override double ScoreMultiplier => 0.3;
+        public override double ScoreMultiplier => 0.5;
     }
 }

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

@@ -7,6 +7,6 @@ namespace osu.Game.Rulesets.Mania.Mods
 {
     public class ManiaModHardRock : ModHardRock
     {
-        public override double ScoreMultiplier => 1.0;
+        public override double ScoreMultiplier => 1;
     }
 }

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

@@ -8,8 +8,8 @@ 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 string Description => @"Keys fade out before you hit them!";
+        public override double ScoreMultiplier => 1;
         public override Type[] IncompatibleMods => new[] { typeof(ModFlashlight) };
     }
 }

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

@@ -6,6 +6,8 @@ namespace osu.Game.Rulesets.Mania.Mods
     public class ManiaModKey1 : ManiaKeyMod
     {
         public override int KeyCount => 1;
-        public override string Name => "1K";
+        public override string Name => "One Key";
+        public override string ShortenedName => "1K";
+        public override string Description => @"Play with one key.";
     }
 }

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

@@ -6,6 +6,8 @@ namespace osu.Game.Rulesets.Mania.Mods
     public class ManiaModKey2 : ManiaKeyMod
     {
         public override int KeyCount => 2;
-        public override string Name => "2K";
+        public override string Name => "Two Keys";
+        public override string ShortenedName => "2K";
+        public override string Description => @"Play with two keys.";
     }
 }

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

@@ -6,6 +6,8 @@ namespace osu.Game.Rulesets.Mania.Mods
     public class ManiaModKey3 : ManiaKeyMod
     {
         public override int KeyCount => 3;
-        public override string Name => "3K";
+        public override string Name => "Three Keys";
+        public override string ShortenedName => "3K";
+        public override string Description => @"Play with three keys.";
     }
 }

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

@@ -6,6 +6,8 @@ namespace osu.Game.Rulesets.Mania.Mods
     public class ManiaModKey4 : ManiaKeyMod
     {
         public override int KeyCount => 4;
-        public override string Name => "4K";
+        public override string Name => "Four Keys";
+        public override string ShortenedName => "4K";
+        public override string Description => @"Play with four keys.";
     }
 }

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

@@ -6,6 +6,8 @@ namespace osu.Game.Rulesets.Mania.Mods
     public class ManiaModKey5 : ManiaKeyMod
     {
         public override int KeyCount => 5;
-        public override string Name => "5K";
+        public override string Name => "Five Keys";
+        public override string ShortenedName => "5K";
+        public override string Description => @"Play with five keys.";
     }
 }

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

@@ -6,6 +6,8 @@ namespace osu.Game.Rulesets.Mania.Mods
     public class ManiaModKey6 : ManiaKeyMod
     {
         public override int KeyCount => 6;
-        public override string Name => "6K";
+        public override string Name => "Six Keys";
+        public override string ShortenedName => "6K";
+        public override string Description => @"Play with six keys.";
     }
 }

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

@@ -6,6 +6,8 @@ namespace osu.Game.Rulesets.Mania.Mods
     public class ManiaModKey7 : ManiaKeyMod
     {
         public override int KeyCount => 7;
-        public override string Name => "7K";
+        public override string Name => "Seven Keys";
+        public override string ShortenedName => "7K";
+        public override string Description => @"Play with seven keys.";
     }
 }

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

@@ -6,6 +6,8 @@ namespace osu.Game.Rulesets.Mania.Mods
     public class ManiaModKey8 : ManiaKeyMod
     {
         public override int KeyCount => 8;
-        public override string Name => "8K";
+        public override string Name => "Eight Keys";
+        public override string ShortenedName => "8K";
+        public override string Description => @"Play with eight keys.";
     }
 }

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

@@ -6,6 +6,8 @@ namespace osu.Game.Rulesets.Mania.Mods
     public class ManiaModKey9 : ManiaKeyMod
     {
         public override int KeyCount => 9;
-        public override string Name => "9K";
+        public override string Name => "Nine Keys";
+        public override string ShortenedName => "9K";
+        public override string Description => @"Play with nine keys.";
     }
 }

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

@@ -7,6 +7,6 @@ namespace osu.Game.Rulesets.Mania.Mods
 {
     public class ManiaModNightcore : ModNightcore
     {
-        public override double ScoreMultiplier => 1.0;
+        public override double ScoreMultiplier => 1;
     }
 }

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

@@ -17,8 +17,8 @@ namespace osu.Game.Rulesets.Mania.Mods
         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 override string Description => @"Shuffle around the keys!";
+        public override double ScoreMultiplier => 0;
 
         public void ApplyToRulesetContainer(RulesetContainer<ManiaHitObject> rulesetContainer)
         {

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

@@ -7,6 +7,6 @@ namespace osu.Game.Rulesets.Osu.Mods
 {
     public class OsuModDaycore : ModDaycore
     {
-        public override double ScoreMultiplier => 0.5;
+        public override double ScoreMultiplier => 0.3;
     }
 }

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

@@ -7,5 +7,6 @@ namespace osu.Game.Rulesets.Osu.Mods
 {
     public class OsuModEasy : ModEasy
     {
+        public override string Description => @"Larger circles, more forgiving HP drain, less accuracy required, and three lives!";
     }
 }

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

@@ -7,6 +7,6 @@ namespace osu.Game.Rulesets.Osu.Mods
 {
     public class OsuModHalfTime : ModHalfTime
     {
-        public override double ScoreMultiplier => 0.5;
+        public override double ScoreMultiplier => 0.3;
     }
 }

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

@@ -14,7 +14,6 @@ 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)
         {

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

@@ -15,7 +15,7 @@ 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 string Description => @"Play with no approach circles and fading circles/sliders.";
         public override double ScoreMultiplier => 1.06;
 
         private const double fade_in_duration_multiplier = 0.4;

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

@@ -9,7 +9,7 @@ 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 string Description => @"You don't need to click. Give your clicking/tapping fingers 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

@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         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 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/OsuModTarget.cs

@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         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 string Description => @"Practice keeping up with the beat of the song.";
         public override double ScoreMultiplier => 1;
     }
 }

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

@@ -7,6 +7,6 @@ namespace osu.Game.Rulesets.Taiko.Mods
 {
     public class TaikoModDaycore : ModDaycore
     {
-        public override double ScoreMultiplier => 0.5;
+        public override double ScoreMultiplier => 0.3;
     }
 }

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

@@ -7,5 +7,6 @@ namespace osu.Game.Rulesets.Taiko.Mods
 {
     public class TaikoModEasy : ModEasy
     {
+        public override string Description => @"Beats move slower, less accuracy required, and three lives!";
     }
 }

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

@@ -7,6 +7,6 @@ namespace osu.Game.Rulesets.Taiko.Mods
 {
     public class TaikoModHalfTime : ModHalfTime
     {
-        public override double ScoreMultiplier => 0.5;
+        public override double ScoreMultiplier => 0.3;
     }
 }

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

@@ -8,6 +8,5 @@ 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

@@ -7,7 +7,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
 {
     public class TaikoModHidden : ModHidden
     {
-        public override string Description => @"The notes fade out before you hit them!";
+        public override string Description => @"Beats fade out before you hit them!";
         public override double ScoreMultiplier => 1.06;
     }
 }

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

@@ -7,6 +7,6 @@ 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.";
+        public override string Description => @"No ninja-like spinners, demanding drumrolls or unexpected katu's.";
     }
 }

osu.Game/Overlays/Mods/DifficultyIncreaseSection.cs

@@ -21,7 +21,7 @@ namespace osu.Game.Overlays.Mods
 
         public DifficultyIncreaseSection()
         {
-            Header = @"Gameplay Difficulty Increase";
+            Header = @"Difficulty Increase";
         }
     }
 }

osu.Game/Overlays/Mods/DifficultyReductionSection.cs

@@ -21,7 +21,7 @@ namespace osu.Game.Overlays.Mods
 
         public DifficultyReductionSection()
         {
-            Header = @"Gameplay Difficulty Reduction";
+            Header = @"Difficulty Reduction";
         }
     }
 }

osu.Game/Overlays/Mods/ModSelectOverlay.cs

@@ -287,7 +287,7 @@ namespace osu.Game.Overlays.Mods
                                     Anchor = Anchor.TopCentre,
                                     Action = modButtonPressed,
                                 },
-                                new AssistedSection
+                                new SpecialSection
                                 {
                                     RelativeSizeAxes = Axes.X,
                                     Origin = Anchor.TopCentre,

osu.Game/Overlays/Mods/SpecialSection.cs

@@ -8,7 +8,7 @@ using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Overlays.Mods
 {
-    public class AssistedSection : ModSection
+    public class SpecialSection : ModSection
     {
         protected override Key[] ToggleKeys => new[] { Key.Z, Key.X, Key.C, Key.V, Key.B, Key.N, Key.M };
         public override ModType ModType => ModType.Special;
@@ -19,9 +19,9 @@ namespace osu.Game.Overlays.Mods
             SelectedColour = colours.BlueLight;
         }
 
-        public AssistedSection()
+        public SpecialSection()
         {
-            Header = @"Assisted";
+            Header = @"Special";
         }
     }
 }

osu.Game/Rulesets/Mods/ModAutoplay.cs

@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Mods
         public override string Name => "Autoplay";
         public override string ShortenedName => "AT";
         public override FontAwesome Icon => FontAwesome.fa_osu_mod_auto;
-        public override string Description => "Watch a perfect automated play through the song";
+        public override string Description => "Watch a perfect automated play through the song.";
         public override double ScoreMultiplier => 0;
         public bool AllowFail => false;
         public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModNoFail) };

osu.Game/Rulesets/Mods/ModCinema.cs

@@ -11,5 +11,6 @@ namespace osu.Game.Rulesets.Mods
         public override string ShortenedName => "CN";
         public override bool HasImplementation => false;
         public override FontAwesome Icon => FontAwesome.fa_osu_mod_cinema;
+        public override string Description => "Watch the video without visual distractions.";
     }
 }

osu.Game/Rulesets/Mods/ModDaycore.cs

@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Mods
         public override string Name => "Daycore";
         public override string ShortenedName => "DC";
         public override FontAwesome Icon => FontAwesome.fa_question;
-        public override string Description => "whoaaaaa";
+        public override string Description => "Whoaaaaa...";
 
         public override void ApplyToClock(IAdjustableClock clock)
         {

osu.Game/Rulesets/Mods/ModDoubleTime.cs

@@ -7,18 +7,16 @@ using osu.Game.Graphics;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public class ModDoubleTime : Mod, IApplicableToClock
+    public abstract class ModDoubleTime : Mod, IApplicableToClock
     {
         public override string Name => "Double Time";
         public override string ShortenedName => "DT";
         public override FontAwesome Icon => FontAwesome.fa_osu_mod_doubletime;
         public override ModType Type => ModType.DifficultyIncrease;
-        public override string Description => "Zoooooooooom";
+        public override string Description => "Zoooooooooom...";
         public override bool Ranked => true;
         public override Type[] IncompatibleMods => new[] { typeof(ModHalfTime) };
 
-        public override double ScoreMultiplier => 1.12;
-
         public virtual void ApplyToClock(IAdjustableClock clock)
         {
             clock.Rate = 1.5;

osu.Game/Rulesets/Mods/ModEasy.cs

@@ -13,7 +13,6 @@ namespace osu.Game.Rulesets.Mods
         public override string ShortenedName => "EZ";
         public override FontAwesome Icon => FontAwesome.fa_osu_mod_easy;
         public override ModType Type => ModType.DifficultyReduction;
-        public override string Description => "Reduces overall difficulty - larger circles, more forgiving HP drain, less accuracy required.";
         public override double ScoreMultiplier => 0.5;
         public override bool Ranked => true;
         public override Type[] IncompatibleMods => new[] { typeof(ModHardRock) };

osu.Game/Rulesets/Mods/ModHalfTime.cs

@@ -13,12 +13,10 @@ namespace osu.Game.Rulesets.Mods
         public override string ShortenedName => "HT";
         public override FontAwesome Icon => FontAwesome.fa_osu_mod_halftime;
         public override ModType Type => ModType.DifficultyReduction;
-        public override string Description => "Less zoom";
+        public override string Description => "Less zoom...";
         public override bool Ranked => true;
         public override Type[] IncompatibleMods => new[] { typeof(ModDoubleTime) };
 
-        public override double ScoreMultiplier => 1.12;
-
         public virtual void ApplyToClock(IAdjustableClock clock)
         {
             clock.Rate = 0.75;

osu.Game/Rulesets/Mods/ModHardRock.cs

@@ -14,6 +14,7 @@ namespace osu.Game.Rulesets.Mods
         public override FontAwesome Icon => FontAwesome.fa_osu_mod_hardrock;
         public override ModType Type => ModType.DifficultyIncrease;
         public override string Description => "Everything just got a bit harder...";
+        public override bool Ranked => true;
         public override Type[] IncompatibleMods => new[] { typeof(ModEasy) };
 
         public void ApplyToDifficulty(BeatmapDifficulty difficulty)

osu.Game/Rulesets/Mods/ModNightcore.cs

@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Mods
         public override string Name => "Nightcore";
         public override string ShortenedName => "NC";
         public override FontAwesome Icon => FontAwesome.fa_osu_mod_nightcore;
-        public override string Description => "uguuuuuuuu";
+        public override string Description => "Uguuuuuuuu...";
 
         public override void ApplyToClock(IAdjustableClock clock)
         {

osu.Game/Rulesets/Mods/ModNoFail.cs

@@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Mods
 {
     public abstract class ModNoFail : Mod, IApplicableFailOverride
     {
-        public override string Name => "NoFail";
+        public override string Name => "No Fail";
         public override string ShortenedName => "NF";
         public override FontAwesome Icon => FontAwesome.fa_osu_mod_nofail;
         public override ModType Type => ModType.DifficultyReduction;

osu.Game/Rulesets/Mods/ModPerfect.cs

@@ -1,6 +1,7 @@
 // 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.Scoring;
 
 namespace osu.Game.Rulesets.Mods
@@ -9,6 +10,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "Perfect";
         public override string ShortenedName => "PF";
+        public override FontAwesome Icon => FontAwesome.fa_question;
         public override string Description => "SS or quit.";
 
         protected override bool FailCondition(ScoreProcessor scoreProcessor) => scoreProcessor.Accuracy.Value != 1;

osu.Game/Rulesets/Mods/ModSuddenDeath.cs

@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Mods
         public override string ShortenedName => "SD";
         public override FontAwesome Icon => FontAwesome.fa_osu_mod_suddendeath;
         public override ModType Type => ModType.DifficultyIncrease;
-        public override string Description => "Miss a note and fail.";
+        public override string Description => "Miss and fail.";
         public override double ScoreMultiplier => 1;
         public override bool Ranked => true;
         public override Type[] IncompatibleMods => new[] { typeof(ModNoFail), typeof(ModRelax), typeof(ModAutoplay) };

osu.Game/Rulesets/Mods/MultiMod.cs

@@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Mods
         public override string Name => string.Empty;
         public override string ShortenedName => string.Empty;
         public override string Description => string.Empty;
-        public override double ScoreMultiplier => 0.0;
+        public override double ScoreMultiplier => 0;
 
         public Mod[] Mods;
     }

osu.Game/osu.Game.csproj

@@ -555,7 +555,7 @@
     <Compile Include="Overlays\MainSettings.cs" />
     <Compile Include="Overlays\MedalOverlay.cs" />
     <Compile Include="Overlays\MedalSplash\DrawableMedal.cs" />
-    <Compile Include="Overlays\Mods\AssistedSection.cs" />
+    <Compile Include="Overlays\Mods\SpecialSection.cs" />
     <Compile Include="Overlays\Mods\DifficultyIncreaseSection.cs" />
     <Compile Include="Overlays\Mods\DifficultyReductionSection.cs" />
     <Compile Include="Overlays\Mods\ModButton.cs" />