From 5d838628d7e49df3b3ce3e1768e6c19c68e366fe Mon Sep 17 00:00:00 2001
From: Gabe Livengood <47010459+ggliv@users.noreply.github.com>
Date: Fri, 27 May 2022 23:15:19 -0400
Subject: [PATCH] add test, fix formatting, expose easing function

---
 .../Mods/TestSceneOsuModRepel.cs              | 27 +++++++++++++++++++
 .../Mods/OsuEaseHitObjectPositionsMod.cs      | 12 ++++-----
 2 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModRepel.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModRepel.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModRepel.cs
new file mode 100644
index 0000000000..6bd41e2fa5
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModRepel.cs
@@ -0,0 +1,27 @@
+// 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 NUnit.Framework;
+using osu.Game.Rulesets.Osu.Mods;
+
+namespace osu.Game.Rulesets.Osu.Tests.Mods
+{
+    public class TestSceneOsuModRepel : OsuModTestScene
+    {
+        [TestCase(0.1f)]
+        [TestCase(0.5f)]
+        [TestCase(1)]
+        public void TestRepel(float strength)
+        {
+            CreateModTest(new ModTestData
+            {
+                Mod = new OsuModRepel
+                {
+                    RepulsionStrength = { Value = strength },
+                },
+                PassCondition = () => true,
+                Autoplay = false,
+            });
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuEaseHitObjectPositionsMod.cs b/osu.Game.Rulesets.Osu/Mods/OsuEaseHitObjectPositionsMod.cs
index d81d86dc65..2c344b7a68 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuEaseHitObjectPositionsMod.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuEaseHitObjectPositionsMod.cs
@@ -23,8 +23,8 @@ namespace osu.Game.Rulesets.Osu.Mods
         protected BindableFloat EasementStrength = new BindableFloat(0.5f);
         protected Vector2 CursorPosition;
         protected DrawableHitObject WorkingHitObject;
-        protected abstract Vector2 DestinationVector { get; }
-        
+        protected virtual Vector2 DestinationVector => WorkingHitObject.Position;
+
         private IFrameStableClock gameplayClock;
 
         public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
@@ -47,22 +47,22 @@ namespace osu.Game.Rulesets.Osu.Mods
                 switch (drawable)
                 {
                     case DrawableHitCircle circle:
-                        easeHitObjectPositionToVector(circle, DestinationVector);
+                        EaseHitObjectPositionToVector(circle, DestinationVector);
                         break;
 
                     case DrawableSlider slider:
 
                         if (!slider.HeadCircle.Result.HasResult)
-                            easeHitObjectPositionToVector(slider, DestinationVector);
+                            EaseHitObjectPositionToVector(slider, DestinationVector);
                         else
-                            easeHitObjectPositionToVector(slider, DestinationVector - slider.Ball.DrawPosition);
+                            EaseHitObjectPositionToVector(slider, DestinationVector - slider.Ball.DrawPosition);
 
                         break;
                 }
             }
         }
 
-        private void easeHitObjectPositionToVector(DrawableHitObject hitObject, Vector2 destination)
+        protected void EaseHitObjectPositionToVector(DrawableHitObject hitObject, Vector2 destination)
         {
             double dampLength = Interpolation.Lerp(3000, 40, EasementStrength.Value);