From 1057981c793dfabd262123cacfb47f36df57a844 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Tue, 7 Apr 2020 16:40:01 +0800
Subject: [PATCH] Added arbitrary hit handler to drum roll object

---
 .../Objects/Drawables/DrawableDrumRoll.cs     | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 5806c90115..3e7b6dfd31 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -34,6 +34,14 @@ public class DrawableDrumRoll : DrawableTaikoHitObject<DrumRoll>
         private Color4 colourIdle;
         private Color4 colourEngaged;
 
+        private bool judgingStarted;
+
+        /// <summary>
+        /// A handler action for when the drumroll has been hit,
+        /// regardless of any judgement.
+        /// </summary>
+        public Action<TaikoAction> OnHit;
+
         public DrawableDrumRoll(DrumRoll drumRoll)
             : base(drumRoll)
         {
@@ -86,15 +94,27 @@ protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)
 
         protected override TaikoPiece CreateMainPiece() => new ElongatedCirclePiece();
 
-        public override bool OnPressed(TaikoAction action) => false;
+        public override bool OnPressed(TaikoAction action)
+        {
+            if (judgingStarted)
+                OnHit.Invoke(action);
+
+            return false;
+        }
 
         private void onNewResult(DrawableHitObject obj, JudgementResult result)
         {
             if (!(obj is DrawableDrumRollTick))
                 return;
 
+            DrawableDrumRollTick drumRollTick = (DrawableDrumRollTick)obj;
+
             if (result.Type > HitResult.Miss)
+            {
+                OnHit.Invoke(drumRollTick.JudgedAction);
+                judgingStarted = true;
                 rollingHits++;
+            }
             else
                 rollingHits--;
 
@@ -113,8 +133,11 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
                 return;
 
             int countHit = NestedHitObjects.Count(o => o.IsHit);
+
             if (countHit >= HitObject.RequiredGoodHits)
+            {
                 ApplyResult(r => r.Type = countHit >= HitObject.RequiredGreatHits ? HitResult.Great : HitResult.Good);
+            }
             else
                 ApplyResult(r => r.Type = HitResult.Miss);
         }