make ModDifficultyAdjust abstract

osu.Game.Rulesets.Catch/CatchRuleset.cs

@@ -109,7 +109,7 @@ namespace osu.Game.Rulesets.Catch
                 case ModType.Conversion:
                     return new Mod[]
                     {
-                        new ModDifficultyAdjust(),
+                        new CatchModDifficultyAdjust(),
                     };
 
                 case ModType.Automation:

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

@@ -0,0 +1,52 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Bindables;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Catch.Mods
+{
+    public class CatchModDifficultyAdjust : ModDifficultyAdjust
+    {
+        [SettingSource("Drain Rate", "Override a beatmap's set HP.")]
+        public override BindableNumber<float> DrainRate { get; } = new BindableFloat()
+        {
+            Precision = 0.1f,
+            MinValue = 1,
+            MaxValue = 10,
+            Default = 5,
+            Value = 5,
+        };
+
+        [SettingSource("Fruit Size", "Override a beatmap's set CS.")]
+        public override BindableNumber<float> CircleSize { get; } = new BindableFloat()
+        {
+            Precision = 0.1f,
+            MinValue = 1,
+            MaxValue = 10,
+            Default = 5,
+            Value = 5,
+        };
+
+        [SettingSource("Approach Rate", "Override a beatmap's set AR.")]
+        public override BindableNumber<float> ApproachRate { get; } = new BindableFloat()
+        {
+            Precision = 0.1f,
+            MinValue = 1,
+            MaxValue = 10,
+            Default = 5,
+            Value = 5,
+        };
+
+        [SettingSource("Overall Difficulty", "Override a beatmap's set OD.")]
+        public override BindableNumber<float> OverallDifficulty { get; } = new BindableFloat()
+        {
+            Precision = 0.1f,
+            MinValue = 1,
+            MaxValue = 10,
+            Default = 5,
+            Value = 5,
+        };
+    }
+}

osu.Game.Rulesets.Mania/ManiaRuleset.cs

@@ -151,7 +151,7 @@ namespace osu.Game.Rulesets.Mania
                         new ManiaModRandom(),
                         new ManiaModDualStages(),
                         new ManiaModMirror(),
-                        new ModDifficultyAdjust(),
+                        new ManiaModDifficultyAdjust(),
                     };
 
                 case ModType.Automation:

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

@@ -0,0 +1,32 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Bindables;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModDifficultyAdjust : ModDifficultyAdjust
+    {
+        [SettingSource("Drain Rate", "Override a beatmap's set HP.")]
+        public override BindableNumber<float> DrainRate { get; } = new BindableFloat()
+        {
+            Precision = 0.1f,
+            MinValue = 1,
+            MaxValue = 10,
+            Default = 5,
+            Value = 5,
+        };
+
+        [SettingSource("Overall Difficulty", "Override a beatmap's set OD.")]
+        public override BindableNumber<float> OverallDifficulty { get; } = new BindableFloat()
+        {
+            Precision = 0.1f,
+            MinValue = 1,
+            MaxValue = 10,
+            Default = 5,
+            Value = 5,
+        };
+    }
+}

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

@@ -0,0 +1,52 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Bindables;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Osu.Mods
+{
+    public class OsuModDifficultyAdjust : ModDifficultyAdjust
+    {
+        [SettingSource("Drain Rate", "Override a beatmap's set HP.")]
+        public override BindableNumber<float> DrainRate { get; } = new BindableFloat()
+        {
+            Precision = 0.1f,
+            MinValue = 1,
+            MaxValue = 10,
+            Default = 5,
+            Value = 5,
+        };
+
+        [SettingSource("Circle Size", "Override a beatmap's set CS.")]
+        public override BindableNumber<float> CircleSize { get; } = new BindableFloat()
+        {
+            Precision = 0.1f,
+            MinValue = 1,
+            MaxValue = 10,
+            Default = 5,
+            Value = 5,
+        };
+
+        [SettingSource("Approach Rate", "Override a beatmap's set AR.")]
+        public override BindableNumber<float> ApproachRate { get; } = new BindableFloat()
+        {
+            Precision = 0.1f,
+            MinValue = 1,
+            MaxValue = 10,
+            Default = 5,
+            Value = 5,
+        };
+
+        [SettingSource("Overall Difficulty", "Override a beatmap's set OD.")]
+        public override BindableNumber<float> OverallDifficulty { get; } = new BindableFloat()
+        {
+            Precision = 0.1f,
+            MinValue = 1,
+            MaxValue = 10,
+            Default = 5,
+            Value = 5,
+        };
+    }
+}

osu.Game.Rulesets.Osu/OsuRuleset.cs

@@ -130,7 +130,7 @@ namespace osu.Game.Rulesets.Osu
                     return new Mod[]
                     {
                         new OsuModTarget(),
-                        new ModDifficultyAdjust(),
+                        new OsuModDifficultyAdjust(),
                     };
 
                 case ModType.Automation:

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

@@ -0,0 +1,32 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Bindables;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Taiko.Mods
+{
+    public class TaikoModDifficultyAdjust : ModDifficultyAdjust
+    {
+        [SettingSource("Drain Rate", "Override a beatmap's set HP.")]
+        public override BindableNumber<float> DrainRate { get; } = new BindableFloat()
+        {
+            Precision = 0.1f,
+            MinValue = 1,
+            MaxValue = 10,
+            Default = 5,
+            Value = 5,
+        };
+
+        [SettingSource("Overall Difficulty", "Override a beatmap's set OD.")]
+        public override BindableNumber<float> OverallDifficulty { get; } = new BindableFloat()
+        {
+            Precision = 0.1f,
+            MinValue = 1,
+            MaxValue = 10,
+            Default = 5,
+            Value = 5,
+        };
+    }
+}

osu.Game.Rulesets.Taiko/TaikoRuleset.cs

@@ -108,7 +108,7 @@ namespace osu.Game.Rulesets.Taiko
                 case ModType.Conversion:
                     return new Mod[]
                     {
-                        new ModDifficultyAdjust(),
+                        new TaikoModDifficultyAdjust(),
                     };
 
                 case ModType.Automation:

osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs

@@ -5,11 +5,10 @@ using osu.Game.Beatmaps;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 using System;
-using osu.Game.Configuration;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public class ModDifficultyAdjust : Mod, IApplicableToDifficulty
+    public abstract class ModDifficultyAdjust : Mod, IApplicableToDifficulty
     {
         public override string Name => @"Difficulty Adjust";
 
@@ -25,45 +24,13 @@ namespace osu.Game.Rulesets.Mods
 
         public override Type[] IncompatibleMods => new[] { typeof(ModEasy), typeof(ModHardRock) };
 
-        [SettingSource("Drain Rate", "Override the beatmap's set HP")]
+        public virtual BindableNumber<float> DrainRate { get; }
-        public BindableNumber<float> DrainRate { get; } = new BindableFloat
-        {
-            MinValue = 1,
-            MaxValue = 10,
-            Default = 5,
-            Value = 5,
-            Precision = 0.1F,
-        };
 
-        [SettingSource("Circle Size", "Override the beatmap's set CS")]
+        public virtual BindableNumber<float> CircleSize { get; }
-        public BindableNumber<float> CircleSize { get; } = new BindableFloat
-        {
-            MinValue = 1,
-            MaxValue = 10,
-            Default = 5,
-            Value = 5,
-            Precision = 0.1F,
-        };
 
-        [SettingSource("Approach Rate", "Override the beatmap's set AR")]
+        public virtual BindableNumber<float> ApproachRate { get; }
-        public BindableNumber<float> ApproachRate { get; } = new BindableFloat
-        {
-            MinValue = 1,
-            MaxValue = 10,
-            Default = 5,
-            Value = 5,
-            Precision = 0.1F,
-        };
 
-        [SettingSource("Overall Difficulty", "Override the beatmap's set OD")]
+        public virtual BindableNumber<float> OverallDifficulty { get; }
-        public BindableNumber<float> OverallDifficulty { get; } = new BindableFloat
-        {
-            MinValue = 1,
-            MaxValue = 10,
-            Default = 5,
-            Value = 5,
-            Precision = 0.1F,
-        };
 
         private BeatmapDifficulty difficulty;
 
@@ -72,17 +39,25 @@ namespace osu.Game.Rulesets.Mods
             if (this.difficulty == null || this.difficulty.ID != difficulty.ID)
             {
                 this.difficulty = difficulty;
+
+                if (DrainRate != null)
                     DrainRate.Value = DrainRate.Default = difficulty.DrainRate;
+
+                if (CircleSize != null)
                     CircleSize.Value = CircleSize.Default = difficulty.CircleSize;
+
+                if (ApproachRate != null)
                     ApproachRate.Value = ApproachRate.Default = difficulty.ApproachRate;
+
+                if (OverallDifficulty != null)
                     OverallDifficulty.Value = OverallDifficulty.Default = difficulty.OverallDifficulty;
             }
             else
             {
-                difficulty.DrainRate = DrainRate.Value;
+                difficulty.DrainRate = DrainRate?.Value ?? difficulty.DrainRate;
-                difficulty.CircleSize = CircleSize.Value;
+                difficulty.CircleSize = CircleSize?.Value ?? difficulty.CircleSize;
-                difficulty.ApproachRate = ApproachRate.Value;
+                difficulty.ApproachRate = ApproachRate?.Value ?? difficulty.ApproachRate;
-                difficulty.OverallDifficulty = OverallDifficulty.Value;
+                difficulty.OverallDifficulty = OverallDifficulty?.Value ?? difficulty.OverallDifficulty;
             }
         }
     }