From 48733a7e2f5c4d0d02666950e5d61fe04d435f25 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 29 Apr 2020 17:53:25 +0900
Subject: [PATCH] Change taiko hit explosion animation to match stable for
 skins

---
 .../Skinning/LegacyHitExplosion.cs               | 10 ++++++++--
 .../UI/DefaultHitExplosion.cs                    |  3 +++
 osu.Game.Rulesets.Taiko/UI/HitExplosion.cs       | 16 +++++++---------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
index d29b574866..42d4a34b9d 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyHitExplosion.cs
@@ -22,8 +22,14 @@ namespace osu.Game.Rulesets.Taiko.Skinning
         {
             base.LoadComplete();
 
-            this.FadeIn(120);
-            this.ScaleTo(0.6f).Then().ScaleTo(1, 240, Easing.OutElastic);
+            const double animation_time = 120;
+
+            this.FadeInFromZero(animation_time).Then().FadeOut(animation_time * 1.5);
+
+            this.ScaleTo(0.6f)
+                .Then().ScaleTo(1.1f, animation_time * 0.8)
+                .Then().ScaleTo(0.9f, animation_time * 0.4)
+                .Then().ScaleTo(1f, animation_time * 0.2);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
index aa444d0494..a0ca5f1c39 100644
--- a/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
@@ -49,6 +49,9 @@ namespace osu.Game.Rulesets.Taiko.UI
             base.LoadComplete();
 
             this.ScaleTo(3f, 1000, Easing.OutQuint);
+            this.FadeOut(500);
+
+            Expire(true);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
index 35a54d6ea7..f0585b9c50 100644
--- a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
@@ -23,6 +23,12 @@ namespace osu.Game.Rulesets.Taiko.UI
         [Cached(typeof(DrawableHitObject))]
         public readonly DrawableHitObject JudgedObject;
 
+        private SkinnableDrawable skinnable;
+
+        public override double LifetimeStart => skinnable.Drawable.LifetimeStart;
+
+        public override double LifetimeEnd => skinnable.Drawable.LifetimeEnd;
+
         public HitExplosion(DrawableHitObject judgedObject)
         {
             JudgedObject = judgedObject;
@@ -39,7 +45,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         [BackgroundDependencyLoader]
         private void load()
         {
-            Child = new SkinnableDrawable(new TaikoSkinComponent(getComponentName(JudgedObject.Result?.Type ?? HitResult.Great)), _ => new DefaultHitExplosion());
+            Child = skinnable = new SkinnableDrawable(new TaikoSkinComponent(getComponentName(JudgedObject.Result?.Type ?? HitResult.Great)), _ => new DefaultHitExplosion());
         }
 
         private TaikoSkinComponents getComponentName(HitResult resultType)
@@ -59,14 +65,6 @@ namespace osu.Game.Rulesets.Taiko.UI
             throw new ArgumentOutOfRangeException(nameof(resultType), "Invalid result type");
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            this.FadeOut(500);
-            Expire(true);
-        }
-
         /// <summary>
         /// Transforms this hit explosion to visualise a secondary hit.
         /// </summary>