From 27cfadca16476bc9cbe069294bbc3b141c9cdcc7 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Mon, 1 May 2023 14:14:57 +0200
Subject: [PATCH] add sample info to Banana and SpinnerBonusTick

---
 osu.Game.Rulesets.Catch/Objects/Banana.cs         | 8 +++-----
 osu.Game.Rulesets.Catch/Objects/BananaShower.cs   | 2 +-
 osu.Game.Rulesets.Osu/Objects/Spinner.cs          | 2 +-
 osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs | 6 ------
 osu.Game/Rulesets/Objects/HitObject.cs            | 2 +-
 5 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Banana.cs b/osu.Game.Rulesets.Catch/Objects/Banana.cs
index af03c9acab..e137204c32 100644
--- a/osu.Game.Rulesets.Catch/Objects/Banana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Banana.cs
@@ -22,11 +22,9 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         public override Judgement CreateJudgement() => new CatchBananaJudgement();
 
-        private static readonly List<HitSampleInfo> samples = new List<HitSampleInfo> { new BananaHitSampleInfo() };
-
-        public Banana()
+        public Banana(int volume = 100)
         {
-            Samples = samples;
+            Samples = new List<HitSampleInfo> { new BananaHitSampleInfo(volume) };
         }
 
         // override any external colour changes with banananana
@@ -53,7 +51,7 @@ namespace osu.Game.Rulesets.Catch.Objects
 
             public override IEnumerable<string> LookupNames => lookup_names;
 
-            public BananaHitSampleInfo(int volume = 0)
+            public BananaHitSampleInfo(int volume = 100)
                 : base(string.Empty, volume: volume)
             {
             }
diff --git a/osu.Game.Rulesets.Catch/Objects/BananaShower.cs b/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
index b45f95a8e6..08febeabbf 100644
--- a/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
+++ b/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Catch.Objects
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
-                AddNested(new Banana
+                AddNested(new Banana(GetSampleInfo().Volume)
                 {
                     StartTime = time,
                     BananaIndex = i,
diff --git a/osu.Game.Rulesets.Osu/Objects/Spinner.cs b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
index 55924c19c9..df5898fd67 100644
--- a/osu.Game.Rulesets.Osu/Objects/Spinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 
                 AddNested(i < SpinsRequired
                     ? new SpinnerTick { StartTime = startTime, SpinnerDuration = Duration }
-                    : new SpinnerBonusTick { StartTime = startTime, SpinnerDuration = Duration });
+                    : new SpinnerBonusTick { StartTime = startTime, SpinnerDuration = Duration, Samples = new[] { GetSampleInfo("spinnerbonus") } });
             }
         }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs b/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs
index 81cdf5755b..00ceccaf7b 100644
--- a/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SpinnerBonusTick.cs
@@ -3,7 +3,6 @@
 
 #nullable disable
 
-using osu.Game.Audio;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 
@@ -11,11 +10,6 @@ namespace osu.Game.Rulesets.Osu.Objects
 {
     public class SpinnerBonusTick : SpinnerTick
     {
-        public SpinnerBonusTick()
-        {
-            Samples.Add(new HitSampleInfo("spinnerbonus"));
-        }
-
         public override Judgement CreateJudgement() => new OsuSpinnerBonusTickJudgement();
 
         public class OsuSpinnerBonusTickJudgement : OsuSpinnerTickJudgement
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index 774ff9dc1d..a4cb976d50 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -210,7 +210,7 @@ namespace osu.Game.Rulesets.Objects
         /// </summary>
         /// <param name="sampleName">The name of the sample.</param>
         /// <returns>A populated <see cref="HitSampleInfo"/>.</returns>
-        protected HitSampleInfo GetSampleInfo(string sampleName)
+        protected HitSampleInfo GetSampleInfo(string sampleName = HitSampleInfo.HIT_NORMAL)
         {
             var hitnormalSample = Samples.FirstOrDefault(s => s.Name == HitSampleInfo.HIT_NORMAL);
             return hitnormalSample == null ? new HitSampleInfo(sampleName) : hitnormalSample.With(newName: sampleName);