From aa7d0e2c9699743d220828962d7a2c63d4433e57 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Nov 2022 15:19:08 +0900
Subject: [PATCH] Remove triangles skin specific implementation from base
 `DrawableHit`

---
 .../Objects/Drawables/DrawableHit.cs          |  5 +---
 .../Skinning/Default/CirclePiece.cs           | 25 ++++++++++++++++---
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 484f125a09..02ac054b52 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -201,12 +201,9 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                     break;
 
                 case ArmedState.Hit:
-                    // If we're far enough away from the left stage, we should bring outselves in front of it
+                    // If we're far enough away from the left stage, we should bring ourselves in front of it
                     ProxyContent();
 
-                    var flash = (MainPiece.Drawable as CirclePiece)?.FlashBox;
-                    flash?.FadeTo(0.9f).FadeOut(300);
-
                     const float gravity_time = 300;
                     const float gravity_travel_height = 200;
 
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Default/CirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Default/CirclePiece.cs
index 6b5a9ae6d2..e8edf94e76 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Default/CirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Default/CirclePiece.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Default
 
         private readonly Container background;
 
-        public Box FlashBox;
+        private readonly Box flashBox;
 
         protected CirclePiece()
         {
@@ -122,7 +122,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Default
                     Masking = true,
                     Children = new[]
                     {
-                        FlashBox = new Box
+                        flashBox = new Box
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
@@ -144,6 +144,25 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Default
             });
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            drawableHitObject.ApplyCustomUpdateState += updateStateTransforms;
+            updateStateTransforms(drawableHitObject, drawableHitObject.State.Value);
+        }
+
+        private void updateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)
+        {
+            switch (state)
+            {
+                case ArmedState.Hit:
+                    using (BeginAbsoluteSequence(drawableHitObject.HitStateUpdateTime))
+                        flashBox?.FadeTo(0.9f).FadeOut(300);
+                    break;
+            }
+        }
+
         private const float edge_alpha_kiai = 0.5f;
 
         private void resetEdgeEffects()
@@ -166,7 +185,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Default
 
             if (drawableHitObject.State.Value == ArmedState.Idle)
             {
-                FlashBox
+                flashBox
                     .FadeTo(flash_opacity)
                     .Then()
                     .FadeOut(timingPoint.BeatLength * 0.75, Easing.OutSine);