From 8a3cadc111cfadb6744a5e22b4f5d2bd4abe3550 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 13 Jul 2020 20:12:50 +0900
Subject: [PATCH] Fix judgement animations not resetting on use

---
 .../Objects/Drawables/DrawableOsuJudgement.cs          |  2 ++
 osu.Game/Rulesets/Judgements/DrawableJudgement.cs      | 10 +++++++---
 osu.Game/Skinning/SkinnableDrawable.cs                 |  6 ++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
index cfe969d1cc..1493ddfcf3 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
@@ -62,6 +62,8 @@ protected override void PrepareForUse()
 
             if (lighting != null)
             {
+                lighting.ResetAnimation();
+
                 if (JudgedObject != null)
                 {
                     lightingColour = JudgedObject.AccentColour.GetBoundCopy();
diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index 4e7f0018ef..052aaa3c65 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -31,8 +31,10 @@ public class DrawableJudgement : PoolableDrawable
         public JudgementResult Result { get; private set; }
         public DrawableHitObject JudgedObject { get; private set; }
 
-        protected Container JudgementBody;
-        protected SpriteText JudgementText;
+        protected Container JudgementBody { get; private set; }
+        protected SpriteText JudgementText { get; private set; }
+
+        private SkinnableDrawable bodyDrawable;
 
         /// <summary>
         /// Duration of initial fade in.
@@ -89,6 +91,8 @@ protected override void PrepareForUse()
 
             prepareDrawables();
 
+            bodyDrawable.ResetAnimation();
+
             this.FadeInFromZero(FadeInDuration, Easing.OutQuint);
             JudgementBody.ScaleTo(1);
             JudgementBody.RotateTo(0);
@@ -131,7 +135,7 @@ private void prepareDrawables()
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 RelativeSizeAxes = Axes.Both,
-                Child = new SkinnableDrawable(new GameplaySkinComponent<HitResult>(type), _ => JudgementText = new OsuSpriteText
+                Child = bodyDrawable = new SkinnableDrawable(new GameplaySkinComponent<HitResult>(type), _ => JudgementText = new OsuSpriteText
                 {
                     Text = type.GetDescription().ToUpperInvariant(),
                     Font = OsuFont.Numeric.With(size: 20),
diff --git a/osu.Game/Skinning/SkinnableDrawable.cs b/osu.Game/Skinning/SkinnableDrawable.cs
index 0f0d3da5aa..d9a5036649 100644
--- a/osu.Game/Skinning/SkinnableDrawable.cs
+++ b/osu.Game/Skinning/SkinnableDrawable.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Caching;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Animations;
 using osuTK;
 
 namespace osu.Game.Skinning
@@ -50,6 +51,11 @@ protected SkinnableDrawable(ISkinComponent component, Func<ISkinSource, bool> al
             RelativeSizeAxes = Axes.Both;
         }
 
+        /// <summary>
+        /// Seeks to the 0-th frame if the content of this <see cref="SkinnableDrawable"/> is an <see cref="IFramedAnimation"/>.
+        /// </summary>
+        public void ResetAnimation() => (Drawable as IFramedAnimation)?.GotoFrame(0);
+
         private readonly Func<ISkinComponent, Drawable> createDefault;
 
         private readonly Cached scaling = new Cached();