Merge pull request #354 from LumpBloom7/Smoother-slide-fan

Add more checkpoints to SlideFans
LumpBloom7 · Jul 23, 2022 · ec7a151 · ec7a151
2 parents 1d1b7b4 + 1849be3
commit ec7a151
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 22 deletions.
diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSlideCheckpoint.cs b/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSlideCheckpoint.cs
@@ -28,13 +28,7 @@ public class DrawableSlideCheckpoint : DrawableSentakkiHitObject
         // All hits can only be done after the parent StartTime
         public bool IsHittable => Time.Current > ParentHitObject.HitObject.StartTime && isPreviousNodeHit();
 
-        private bool isPreviousNodeHit()
-        {
-            if (HitObject.StrictCompletionOrder)
-                return ThisIndex < 1 || parentSlide.SlideCheckpoints[ThisIndex - 1].IsHit;
-
-            return ThisIndex < 2 || parentSlide.SlideCheckpoints[ThisIndex - 2].IsHit;
-        }
+        private bool isPreviousNodeHit() => ThisIndex < 2 || parentSlide.SlideCheckpoints[ThisIndex - 2].IsHit;
 
         private Container<DrawableSlideCheckpointNode> nodes;
 

diff --git a/osu.Game.Rulesets.Sentakki/Objects/SlideBody.cs b/osu.Game.Rulesets.Sentakki/Objects/SlideBody.cs
@@ -44,11 +44,11 @@ protected override void CreateNestedHitObjects(CancellationToken cancellationTok
 
         protected virtual void CreateSlideCheckpoints()
         {
-            var distance = SlideInfo.SlidePath.TotalDistance;
-            var nodeCount = (int)Math.Floor(distance / 100);
+            double distance = SlideInfo.SlidePath.TotalDistance;
+            int nodeCount = (int)Math.Floor(distance / 100);
             for (int i = 0; i < nodeCount; i++)
             {
-                var progress = (double)(i + 1) / nodeCount;
+                double progress = (double)(i + 1) / nodeCount;
                 SlideCheckpoint checkpoint = new SlideCheckpoint()
                 {
                     Progress = (float)progress,

diff --git a/osu.Game.Rulesets.Sentakki/Objects/SlideCheckpoint.cs b/osu.Game.Rulesets.Sentakki/Objects/SlideCheckpoint.cs
@@ -8,11 +8,6 @@ namespace osu.Game.Rulesets.Sentakki.Objects
 {
     public class SlideCheckpoint : SentakkiHitObject
     {
-        public SlideCheckpoint(bool strictMode = false)
-        {
-            StrictCompletionOrder = strictMode;
-        }
-
         // Used to update slides visuals
         public float Progress { get; set; }
 
@@ -21,10 +16,6 @@ public SlideCheckpoint(bool strictMode = false)
 
         public int NodesToPass { get; set; } = 1;
 
-        // If this is true, then all previous checkpoints must be completed to hit this one
-        // This is in contrast to non-strict, where you can hit it if the n-2 checkpoint is hit
-        public bool StrictCompletionOrder { get; }
-
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
         {
             foreach (var nodePosition in NodePositions)

diff --git a/osu.Game.Rulesets.Sentakki/Objects/SlideFan.cs b/osu.Game.Rulesets.Sentakki/Objects/SlideFan.cs
@@ -9,10 +9,10 @@ protected override void CreateSlideCheckpoints()
         {
             // Add body nodes (should be two major sets)
             Vector2 originpoint = new Vector2(0, -SentakkiPlayfield.INTERSECTDISTANCE);
-            for (int i = 1; i < 3; ++i)
+            for (int i = 1; i < 5; ++i)
             {
-                float progress = 0.5f * i;
-                SlideCheckpoint checkpoint = new SlideCheckpoint(true)
+                float progress = 0.25f * i;
+                SlideCheckpoint checkpoint = new SlideCheckpoint()
                 {
                     Progress = progress,
                     StartTime = StartTime + ShootDelay + ((Duration - ShootDelay) * progress),