From edc82205543106251bba5a9b8a2c92ea3b81e7ad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 9 Dec 2019 19:58:51 +0900
Subject: [PATCH] Add time ramp settings

---
 osu.Game/Rulesets/Mods/ModTimeRamp.cs |  8 ++++++--
 osu.Game/Rulesets/Mods/ModWindDown.cs | 12 +++++++++++-
 osu.Game/Rulesets/Mods/ModWindUp.cs   | 12 +++++++++++-
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index 36de546707..bffe4f7b70 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -7,6 +7,7 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.Objects;
 
@@ -21,7 +22,8 @@ namespace osu.Game.Rulesets.Mods
 
         public override Type[] IncompatibleMods => new[] { typeof(ModRateAdjust) };
 
-        protected abstract double FinalRateAdjustment { get; }
+        [SettingSource("Final rate", "The final speed to ramp to")]
+        public abstract BindableNumber<double> FinalRate { get; }
 
         private double finalRateTime;
         private double beginRampTime;
@@ -45,6 +47,8 @@ namespace osu.Game.Rulesets.Mods
         {
             HitObject lastObject = beatmap.HitObjects.LastOrDefault();
 
+            SpeedChange.SetDefault();
+
             beginRampTime = beatmap.HitObjects.FirstOrDefault()?.StartTime ?? 0;
             finalRateTime = final_rate_progress * (lastObject?.GetEndTime() ?? 0);
         }
@@ -59,6 +63,6 @@ namespace osu.Game.Rulesets.Mods
         /// </summary>
         /// <param name="amount">The amount of adjustment to apply (from 0..1).</param>
         private void applyAdjustment(double amount) =>
-            SpeedChange.Value = 1 + (Math.Sign(FinalRateAdjustment) * Math.Clamp(amount, 0, 1) * Math.Abs(FinalRateAdjustment));
+            SpeedChange.Value = 1 + (Math.Sign(FinalRate.Value) * Math.Clamp(amount, 0, 1) * Math.Abs(FinalRate.Value));
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModWindDown.cs b/osu.Game/Rulesets/Mods/ModWindDown.cs
index b2e3abb59d..680c1a10fb 100644
--- a/osu.Game/Rulesets/Mods/ModWindDown.cs
+++ b/osu.Game/Rulesets/Mods/ModWindDown.cs
@@ -3,7 +3,9 @@
 
 using System;
 using System.Linq;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Configuration;
 
 namespace osu.Game.Rulesets.Mods
 {
@@ -15,7 +17,15 @@ namespace osu.Game.Rulesets.Mods
         public override IconUsage Icon => FontAwesome.Solid.ChevronCircleDown;
         public override double ScoreMultiplier => 1.0;
 
-        protected override double FinalRateAdjustment => -0.25;
+        [SettingSource("Final rate", "The speed increase to ramp towards")]
+        public override BindableNumber<double> FinalRate { get; } = new BindableDouble
+        {
+            MinValue = -0.5,
+            MaxValue = -0.01,
+            Default = -0.25,
+            Value = -0.25,
+            Precision = 0.01,
+        };
 
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModWindUp)).ToArray();
     }
diff --git a/osu.Game/Rulesets/Mods/ModWindUp.cs b/osu.Game/Rulesets/Mods/ModWindUp.cs
index 8df35a1de2..ca9ce0ea3e 100644
--- a/osu.Game/Rulesets/Mods/ModWindUp.cs
+++ b/osu.Game/Rulesets/Mods/ModWindUp.cs
@@ -3,7 +3,9 @@
 
 using System;
 using System.Linq;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Configuration;
 
 namespace osu.Game.Rulesets.Mods
 {
@@ -15,7 +17,15 @@ namespace osu.Game.Rulesets.Mods
         public override IconUsage Icon => FontAwesome.Solid.ChevronCircleUp;
         public override double ScoreMultiplier => 1.0;
 
-        protected override double FinalRateAdjustment => 0.5;
+        [SettingSource("Final rate", "The speed increase to ramp towards")]
+        public override BindableNumber<double> FinalRate { get; } = new BindableDouble
+        {
+            MinValue = 0.01,
+            MaxValue = 2,
+            Default = 1.5,
+            Value = 1.5,
+            Precision = 0.01,
+        };
 
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModWindDown)).ToArray();
     }