From a6e840634b255ea86e21cfa8140df3794965ebe6 Mon Sep 17 00:00:00 2001
From: Ronnie Moir <7267697+H2n9@users.noreply.github.com>
Date: Tue, 23 Feb 2021 15:52:53 +0000
Subject: [PATCH] Adjust scrubbing behaviour to allow dragging through rate
 values

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

diff --git a/osu.Game/Rulesets/Mods/ModWindDown.cs b/osu.Game/Rulesets/Mods/ModWindDown.cs
index c47ec5fbde..f9e6854dd4 100644
--- a/osu.Game/Rulesets/Mods/ModWindDown.cs
+++ b/osu.Game/Rulesets/Mods/ModWindDown.cs
@@ -20,7 +20,7 @@ public class ModWindDown : ModTimeRamp
         [SettingSource("Initial rate", "The starting speed of the track")]
         public override BindableNumber<double> InitialRate { get; } = new BindableDouble
         {
-            MinValue = 0.5,
+            MinValue = 0.51,
             MaxValue = 2,
             Default = 1,
             Value = 1,
@@ -31,7 +31,7 @@ public class ModWindDown : ModTimeRamp
         public override BindableNumber<double> FinalRate { get; } = new BindableDouble
         {
             MinValue = 0.5,
-            MaxValue = 2,
+            MaxValue = 1.99,
             Default = 0.75,
             Value = 0.75,
             Precision = 0.01,
@@ -49,10 +49,10 @@ public class ModWindDown : ModTimeRamp
         public ModWindDown()
         {
             InitialRate.BindValueChanged(val =>
-                InitialRate.Value = Math.Max(val.NewValue, FinalRate.Value + 0.01));
+                FinalRate.Value = Math.Min(FinalRate.Value, val.NewValue - 0.01));
 
             FinalRate.BindValueChanged(val =>
-                FinalRate.Value = Math.Min(val.NewValue, InitialRate.Value - 0.01));
+                InitialRate.Value = Math.Max(InitialRate.Value, val.NewValue + 0.01));
         }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModWindUp.cs b/osu.Game/Rulesets/Mods/ModWindUp.cs
index 5a0fab5e67..0d57bbb52d 100644
--- a/osu.Game/Rulesets/Mods/ModWindUp.cs
+++ b/osu.Game/Rulesets/Mods/ModWindUp.cs
@@ -21,7 +21,7 @@ public class ModWindUp : ModTimeRamp
         public override BindableNumber<double> InitialRate { get; } = new BindableDouble
         {
             MinValue = 0.5,
-            MaxValue = 2,
+            MaxValue = 1.99,
             Default = 1,
             Value = 1,
             Precision = 0.01,
@@ -30,7 +30,7 @@ public class ModWindUp : ModTimeRamp
         [SettingSource("Final rate", "The speed increase to ramp towards")]
         public override BindableNumber<double> FinalRate { get; } = new BindableDouble
         {
-            MinValue = 0.5,
+            MinValue = 0.51,
             MaxValue = 2,
             Default = 1.5,
             Value = 1.5,
@@ -49,10 +49,10 @@ public class ModWindUp : ModTimeRamp
         public ModWindUp()
         {
             InitialRate.BindValueChanged(val =>
-                InitialRate.Value = Math.Min(val.NewValue, FinalRate.Value - 0.01));
+                FinalRate.Value = Math.Max(FinalRate.Value, val.NewValue + 0.01));
 
             FinalRate.BindValueChanged(val =>
-                FinalRate.Value = Math.Max(val.NewValue, InitialRate.Value + 0.01));
+                InitialRate.Value = Math.Min(InitialRate.Value, val.NewValue - 0.01));
         }
     }
 }