Merge pull request #10261 from bdach/fix-flying-hit-colour

Fix drum rolls only spawning centre flying hits

osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs

@@ -0,0 +1,48 @@
+// 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 System.Linq;
+using NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Taiko.Judgements;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Objects.Drawables;
+using osu.Game.Rulesets.Taiko.UI;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    [TestFixture]
+    public class TestSceneFlyingHits : DrawableTaikoRulesetTestScene
+    {
+        [TestCase(HitType.Centre)]
+        [TestCase(HitType.Rim)]
+        public void TestFlyingHits(HitType hitType)
+        {
+            DrawableFlyingHit flyingHit = null;
+
+            AddStep("add flying hit", () =>
+            {
+                addFlyingHit(hitType);
+
+                // flying hits all land in one common scrolling container (and stay there for rewind purposes),
+                // so we need to manually get the latest one.
+                flyingHit = this.ChildrenOfType<DrawableFlyingHit>()
+                                .OrderByDescending(h => h.HitObject.StartTime)
+                                .FirstOrDefault();
+            });
+
+            AddAssert("hit type is correct", () => flyingHit.HitObject.Type == hitType);
+        }
+
+        private void addFlyingHit(HitType hitType)
+        {
+            var tick = new DrumRollTick { HitWindows = HitWindows.Empty, StartTime = DrawableRuleset.Playfield.Time.Current };
+
+            DrawableDrumRollTick h;
+            DrawableRuleset.Playfield.Add(h = new DrawableDrumRollTick(tick) { JudgementType = hitType });
+            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(tick, new TaikoDrumRollTickJudgement()) { Type = HitResult.Perfect });
+        }
+    }
+}

osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableFlyingHit.cs

@@ -27,5 +27,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             base.LoadComplete();
             ApplyResult(r => r.Type = r.Judgement.MaxResult);
         }
+
+        protected override void LoadSamples()
+        {
+            // block base call - flying hits are not supposed to play samples
+            // the base call could overwrite the type of this hit
+        }
     }
 }