From f45cedeb8524206a37f7dd7a59cadf5ed20fde21 Mon Sep 17 00:00:00 2001
From: Ronnie Moir <7267697+H2n9@users.noreply.github.com>
Date: Tue, 23 Feb 2021 15:38:09 +0000
Subject: [PATCH] Adjust initial and final rate ranges and prevent them from
 overlapping

---
 osu.Game/Rulesets/Mods/ModWindDown.cs | 13 +++++++++++--
 osu.Game/Rulesets/Mods/ModWindUp.cs   | 13 +++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModWindDown.cs b/osu.Game/Rulesets/Mods/ModWindDown.cs
index 679b50057b..c47ec5fbde 100644
--- a/osu.Game/Rulesets/Mods/ModWindDown.cs
+++ b/osu.Game/Rulesets/Mods/ModWindDown.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Mods
         [SettingSource("Initial rate", "The starting speed of the track")]
         public override BindableNumber<double> InitialRate { get; } = new BindableDouble
         {
-            MinValue = 1,
+            MinValue = 0.5,
             MaxValue = 2,
             Default = 1,
             Value = 1,
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Mods
         public override BindableNumber<double> FinalRate { get; } = new BindableDouble
         {
             MinValue = 0.5,
-            MaxValue = 0.99,
+            MaxValue = 2,
             Default = 0.75,
             Value = 0.75,
             Precision = 0.01,
@@ -45,5 +45,14 @@ namespace osu.Game.Rulesets.Mods
         };
 
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModWindUp)).ToArray();
+
+        public ModWindDown()
+        {
+            InitialRate.BindValueChanged(val =>
+                InitialRate.Value = Math.Max(val.NewValue, FinalRate.Value + 0.01));
+
+            FinalRate.BindValueChanged(val =>
+                FinalRate.Value = Math.Min(val.NewValue, InitialRate.Value - 0.01));
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModWindUp.cs b/osu.Game/Rulesets/Mods/ModWindUp.cs
index b733bf423e..5a0fab5e67 100644
--- a/osu.Game/Rulesets/Mods/ModWindUp.cs
+++ b/osu.Game/Rulesets/Mods/ModWindUp.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Mods
         public override BindableNumber<double> InitialRate { get; } = new BindableDouble
         {
             MinValue = 0.5,
-            MaxValue = 1,
+            MaxValue = 2,
             Default = 1,
             Value = 1,
             Precision = 0.01,
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Mods
         [SettingSource("Final rate", "The speed increase to ramp towards")]
         public override BindableNumber<double> FinalRate { get; } = new BindableDouble
         {
-            MinValue = 1.01,
+            MinValue = 0.5,
             MaxValue = 2,
             Default = 1.5,
             Value = 1.5,
@@ -45,5 +45,14 @@ namespace osu.Game.Rulesets.Mods
         };
 
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModWindDown)).ToArray();
+
+        public ModWindUp()
+        {
+            InitialRate.BindValueChanged(val =>
+                InitialRate.Value = Math.Min(val.NewValue, FinalRate.Value - 0.01));
+
+            FinalRate.BindValueChanged(val =>
+                FinalRate.Value = Math.Max(val.NewValue, InitialRate.Value + 0.01));
+        }
     }
 }