From 94886a09b23b2c7d850781eaa20c07b0697a2d3c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Nov 2020 15:39:02 +0900
Subject: [PATCH] Remove fades from DrawableJudgement itself

---
 .../UI/DrawableManiaJudgement.cs                   |  7 +++----
 .../Objects/Drawables/DrawableOsuJudgement.cs      | 14 +++-----------
 osu.Game/Rulesets/Judgements/DrawableJudgement.cs  | 11 +++++++----
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs
index ebce40a785..a341cdd8ec 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs
@@ -19,15 +19,14 @@ namespace osu.Game.Rulesets.Mania.UI
         {
         }
 
-        protected override double FadeInDuration => 50;
-
         protected override void ApplyHitAnimations()
         {
             JudgementBody.ScaleTo(0.8f);
             JudgementBody.ScaleTo(1, 250, Easing.OutElastic);
 
-            JudgementBody.Delay(FadeInDuration).ScaleTo(0.75f, 250);
-            this.Delay(FadeInDuration).FadeOut(200);
+            JudgementBody.Delay(50)
+                         .ScaleTo(0.75f, 250)
+                         .FadeOut(200);
         }
 
         protected override Drawable CreateDefaultJudgement(HitResult result) => new ManiaJudgementPiece(result);
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
index 47fb53379f..90133fb01c 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
@@ -44,26 +44,18 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
-        private double fadeOutDelay;
-        protected override double FadeOutDelay => fadeOutDelay;
-
         protected override void ApplyHitAnimations()
         {
             bool hitLightingEnabled = config.Get<bool>(OsuSetting.HitLighting);
 
             if (hitLightingEnabled)
             {
-                JudgementBody.FadeIn().Delay(FadeInDuration).FadeOut(400);
-
                 Lighting.ScaleTo(0.8f).ScaleTo(1.2f, 600, Easing.Out);
                 Lighting.FadeIn(200).Then().Delay(200).FadeOut(1000);
-            }
-            else
-            {
-                JudgementBody.Alpha = 1;
-            }
 
-            fadeOutDelay = hitLightingEnabled ? 1400 : base.FadeOutDelay;
+                // extend the lifetime to cover lighting fade
+                LifetimeEnd = 1400;
+            }
 
             base.ApplyHitAnimations();
         }
diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index 468b3190b0..09b8353c63 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -1,6 +1,7 @@
 // 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;
 using System.Diagnostics;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
@@ -32,11 +33,13 @@ namespace osu.Game.Rulesets.Judgements
         /// <summary>
         /// Duration of initial fade in.
         /// </summary>
+        [Obsolete("Apply any animations manually via ApplyHitAnimations / ApplyMissAnimations. Defaults were moved inside skinned components.")]
         protected virtual double FadeInDuration => 100;
 
         /// <summary>
         /// Duration to wait until fade out begins. Defaults to <see cref="FadeInDuration"/>.
         /// </summary>
+        [Obsolete("Apply any animations manually via ApplyHitAnimations / ApplyMissAnimations. Defaults were moved inside skinned components.")]
         protected virtual double FadeOutDelay => FadeInDuration;
 
         /// <summary>
@@ -73,7 +76,6 @@ namespace osu.Game.Rulesets.Judgements
         /// </remarks>
         protected virtual void ApplyHitAnimations()
         {
-            this.Delay(FadeOutDelay).FadeOut(400);
         }
 
         /// <summary>
@@ -112,8 +114,6 @@ namespace osu.Game.Rulesets.Judgements
             // not sure if this should remain going forward.
             skinnableJudgement.ResetAnimation();
 
-            this.FadeInFromZero(FadeInDuration, Easing.OutQuint);
-
             switch (Result.Type)
             {
                 case HitResult.None:
@@ -134,7 +134,10 @@ namespace osu.Game.Rulesets.Judgements
                     animatable.PlayAnimation();
             }
 
-            Expire(true);
+            JudgementBody.Expire(true);
+
+            LifetimeStart = JudgementBody.LifetimeStart;
+            LifetimeEnd = JudgementBody.LifetimeEnd;
         }
 
         private HitResult? currentDrawableType;