Merge pull request #545 from LumpBloom7/Simplify-slide-samples

Use Samples instead of NodeSamples in Slides
LumpBloom7 · Jan 30, 2024 · 43dc6a3 · 43dc6a3
2 parents edbd8b9 + 5ef6725
commit 43dc6a3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/osu.Game.Rulesets.Sentakki/Beatmaps/Converter/SentakkiBeatmapConverter.Slider.cs b/osu.Game.Rulesets.Sentakki/Beatmaps/Converter/SentakkiBeatmapConverter.Slider.cs
@@ -73,7 +73,7 @@ private SentakkiHitObject convertSlider(HitObject original)
             },
             Lane = lane.NormalizePath(),
             StartTime = original.StartTime,
-            NodeSamples = nodeSamples,
+            Samples = nodeSamples.FirstOrDefault(),
             Break = headBreak
         };
 

diff --git a/osu.Game.Rulesets.Sentakki/Beatmaps/SentakkiBeatmapConverterOld.cs b/osu.Game.Rulesets.Sentakki/Beatmaps/SentakkiBeatmapConverterOld.cs
@@ -310,7 +310,7 @@ private SentakkiHitObject createTouchNote(HitObject original)
                 },
                 Lane = noteLane,
                 StartTime = original.StartTime,
-                NodeSamples = samples,
+                Samples = samples.FirstOrDefault(),
                 Break = hasBreakHead
             };
         }

diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSlide.cs b/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSlide.cs
@@ -46,6 +46,10 @@ private void load()
                 }
             });
         }
+        protected override void LoadSamples()
+        {
+            // The slide parent object doesn't need a sample
+        }
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {

diff --git a/osu.Game.Rulesets.Sentakki/Objects/Slide.cs b/osu.Game.Rulesets.Sentakki/Objects/Slide.cs
@@ -27,8 +27,6 @@ public double Duration
             set => throw new NotSupportedException();
         }
 
-        public IList<IList<HitSampleInfo>> NodeSamples = new List<IList<HitSampleInfo>>();
-
         public double EndTime => StartTime + Duration;
 
         public override Color4 DefaultNoteColour => Color4.Aqua;
@@ -45,7 +43,7 @@ protected override void CreateNestedHitObjects(CancellationToken cancellationTok
             {
                 LaneBindable = { BindTarget = LaneBindable },
                 StartTime = StartTime,
-                Samples = NodeSamples.Any() ? NodeSamples.First() : new List<HitSampleInfo>(),
+                Samples = Samples,
                 Break = Break,
                 Ex = Ex
             });
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,6 +46,10 @@ private void load() @@
                     }
                 });
             }
+            protected override void LoadSamples()
+            {
+                // The slide parent object doesn't need a sample
+            }
             protected override void CheckForResult(bool userTriggered, double timeOffset)
             {
@@ Expand Down @@