Merge branch 'master' into settings-source-value-changed

osu.Game.Rulesets.Catch/CatchRuleset.cs

@@ -106,6 +106,12 @@ namespace osu.Game.Rulesets.Catch
                         new CatchModFlashlight(),
                     };
 
+                case ModType.Conversion:
+                    return new Mod[]
+                    {
+                        new CatchModDifficultyAdjust(),
+                    };
+
                 case ModType.Automation:
                     return new Mod[]
                     {

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

@@ -0,0 +1,49 @@
+// 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.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Catch.Mods
+{
+    public class CatchModDifficultyAdjust : ModDifficultyAdjust
+    {
+        [SettingSource("Fruit Size", "Override a beatmap's set CS.")]
+        public 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 BindableNumber<float> ApproachRate { get; } = new BindableFloat
+        {
+            Precision = 0.1f,
+            MinValue = 1,
+            MaxValue = 10,
+            Default = 5,
+            Value = 5,
+        };
+
+        protected override void TransferSettings(BeatmapDifficulty difficulty)
+        {
+            base.TransferSettings(difficulty);
+
+            CircleSize.Value = CircleSize.Default = difficulty.CircleSize;
+            ApproachRate.Value = ApproachRate.Default = difficulty.ApproachRate;
+        }
+
+        protected override void ApplySettings(BeatmapDifficulty difficulty)
+        {
+            base.ApplySettings(difficulty);
+
+            difficulty.CircleSize = CircleSize.Value;
+            difficulty.ApproachRate = ApproachRate.Value;
+        }
+    }
+}

osu.Game.Rulesets.Mania/ManiaRuleset.cs

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

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

@@ -0,0 +1,11 @@
+// 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.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModDifficultyAdjust : ModDifficultyAdjust
+    {
+    }
+}

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

@@ -0,0 +1,49 @@
+// 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.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Osu.Mods
+{
+    public class OsuModDifficultyAdjust : ModDifficultyAdjust
+    {
+        [SettingSource("Circle Size", "Override a beatmap's set CS.")]
+        public 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 BindableNumber<float> ApproachRate { get; } = new BindableFloat
+        {
+            Precision = 0.1f,
+            MinValue = 1,
+            MaxValue = 10,
+            Default = 5,
+            Value = 5,
+        };
+
+        protected override void TransferSettings(BeatmapDifficulty difficulty)
+        {
+            base.TransferSettings(difficulty);
+
+            CircleSize.Value = CircleSize.Default = difficulty.CircleSize;
+            ApproachRate.Value = ApproachRate.Default = difficulty.ApproachRate;
+        }
+
+        protected override void ApplySettings(BeatmapDifficulty difficulty)
+        {
+            base.ApplySettings(difficulty);
+
+            difficulty.CircleSize = CircleSize.Value;
+            difficulty.ApproachRate = ApproachRate.Value;
+        }
+    }
+}

osu.Game.Rulesets.Osu/OsuRuleset.cs

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

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

@@ -0,0 +1,11 @@
+// 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.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Taiko.Mods
+{
+    public class TaikoModDifficultyAdjust : ModDifficultyAdjust
+    {
+    }
+}

osu.Game.Rulesets.Taiko/TaikoRuleset.cs

@@ -105,6 +105,12 @@ namespace osu.Game.Rulesets.Taiko
                         new TaikoModFlashlight(),
                     };
 
+                case ModType.Conversion:
+                    return new Mod[]
+                    {
+                        new TaikoModDifficultyAdjust(),
+                    };
+
                 case ModType.Automation:
                     return new Mod[]
                     {

osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs

@@ -0,0 +1,81 @@
+// 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.Game.Beatmaps;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.Sprites;
+using System;
+using osu.Game.Configuration;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public abstract class ModDifficultyAdjust : Mod, IApplicableToDifficulty
+    {
+        public override string Name => @"Difficulty Adjust";
+
+        public override string Description => @"Override a beatmap's difficulty settings.";
+
+        public override string Acronym => "DA";
+
+        public override ModType Type => ModType.Conversion;
+
+        public override IconUsage Icon => FontAwesome.Solid.Hammer;
+
+        public override double ScoreMultiplier => 1.0;
+
+        public override Type[] IncompatibleMods => new[] { typeof(ModEasy), typeof(ModHardRock) };
+
+        [SettingSource("Drain Rate", "Override a beatmap's set HP.")]
+        public 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 BindableNumber<float> OverallDifficulty { get; } = new BindableFloat
+        {
+            Precision = 0.1f,
+            MinValue = 1,
+            MaxValue = 10,
+            Default = 5,
+            Value = 5,
+        };
+
+        private BeatmapDifficulty difficulty;
+
+        public void ApplyToDifficulty(BeatmapDifficulty difficulty)
+        {
+            if (this.difficulty == null || this.difficulty.ID != difficulty.ID)
+            {
+                this.difficulty = difficulty;
+                TransferSettings(difficulty);
+            }
+            else
+                ApplySettings(difficulty);
+        }
+
+        /// <summary>
+        /// Transfer initial settings from the beatmap to settings.
+        /// </summary>
+        /// <param name="difficulty">The beatmap's initial values.</param>
+        protected virtual void TransferSettings(BeatmapDifficulty difficulty)
+        {
+            DrainRate.Value = DrainRate.Default = difficulty.DrainRate;
+            OverallDifficulty.Value = OverallDifficulty.Default = difficulty.OverallDifficulty;
+        }
+
+        /// <summary>
+        /// Apply all custom settings to the provided beatmap.
+        /// </summary>
+        /// <param name="difficulty">The beatmap to have settings applied.</param>
+        protected virtual void ApplySettings(BeatmapDifficulty difficulty)
+        {
+            difficulty.DrainRate = DrainRate.Value;
+            difficulty.OverallDifficulty = OverallDifficulty.Value;
+        }
+    }
+}

osu.Game/Rulesets/Mods/ModEasy.cs

@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Mods
         public override ModType Type => ModType.DifficultyReduction;
         public override double ScoreMultiplier => 0.5;
         public override bool Ranked => true;
-        public override Type[] IncompatibleMods => new[] { typeof(ModHardRock) };
+        public override Type[] IncompatibleMods => new[] { typeof(ModHardRock), typeof(ModDifficultyAdjust) };
 
         private int retries = 2;
 

osu.Game/Rulesets/Mods/ModHardRock.cs

@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Mods
         public override IconUsage Icon => OsuIcon.ModHardrock;
         public override ModType Type => ModType.DifficultyIncrease;
         public override string Description => "Everything just got a bit harder...";
-        public override Type[] IncompatibleMods => new[] { typeof(ModEasy) };
+        public override Type[] IncompatibleMods => new[] { typeof(ModEasy), typeof(ModDifficultyAdjust) };
 
         public void ApplyToDifficulty(BeatmapDifficulty difficulty)
         {