From af2a2781e7126f7d5eeb40f578cd7c4faf8ecd47 Mon Sep 17 00:00:00 2001 From: Shawdooow Date: Sat, 23 Dec 2017 23:12:10 -0500 Subject: [PATCH] fix the fix harder --- osu.Game.Rulesets.Osu/Objects/Slider.cs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs index 44c7792e9c..800573f991 100644 --- a/osu.Game.Rulesets.Osu/Objects/Slider.cs +++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs @@ -117,18 +117,11 @@ namespace osu.Game.Rulesets.Osu.Objects var minDistanceFromEnd = Velocity * 0.01; - bool sliderStart = true; - for (var repeat = 0; repeat < RepeatCount; repeat++) { var repeatStartTime = StartTime + repeat * repeatDuration; var reversed = repeat % 2 == 1; - if (!sliderStart) - sliderStart = true; - else - sliderStart = false; - for (var d = tickDistance; d <= length; d += tickDistance) { if (d > length - minDistanceFromEnd) @@ -137,9 +130,6 @@ namespace osu.Game.Rulesets.Osu.Objects var distanceProgress = d / length; var timeProgress = reversed ? 1 - distanceProgress : distanceProgress; - if (sliderStart) - distanceProgress = 0; - AddNested(new SliderTick { RepeatIndex = repeat, @@ -165,13 +155,20 @@ namespace osu.Game.Rulesets.Osu.Objects var repeatPointDistance = Math.Min(Distance, length); var repeatDuration = length / Velocity; + bool sliderStart = true; + for (var repeat = 1; repeat < RepeatCount; repeat++) { + sliderStart = !sliderStart; + for (var d = repeatPointDistance; d <= length; d += repeatPointDistance) { var repeatStartTime = StartTime + repeat * repeatDuration; var distanceProgress = d / length; + if (sliderStart) + distanceProgress = 0; + AddNested(new RepeatPoint { RepeatIndex = repeat,