From 47e9846315244e9f4824a8fedcb8e6c4dee3cd44 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Jan 2024 18:48:48 +0900
Subject: [PATCH 1/2] Adjust slider tick / end miss animations to be less busy

---
 .../Skinning/Argon/ArgonJudgementPiece.cs             | 11 ++++++-----
 osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs |  9 ++++-----
 osu.Game/Skinning/LegacyJudgementPieceOld.cs          | 10 +++-------
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs
index bb61bd37c1..9a5abba4fb 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs
@@ -65,14 +65,15 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
             if (Result == HitResult.IgnoreMiss || Result == HitResult.LargeTickMiss)
             {
                 this.RotateTo(-45);
-                this.ScaleTo(1.8f);
+                this.ScaleTo(1.6f);
                 this.ScaleTo(1.2f, 100, Easing.In);
 
-                this.MoveTo(Vector2.Zero);
-                this.MoveToOffset(new Vector2(0, 10), 800, Easing.InQuint);
+                this.FadeOutFromOne(400);
             }
             else if (Result.IsMiss())
             {
+                this.FadeOutFromOne(800);
+
                 this.ScaleTo(1.6f);
                 this.ScaleTo(1, 100, Easing.In);
 
@@ -84,14 +85,14 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
             }
             else
             {
+                this.FadeOutFromOne(800);
+
                 JudgementText
                     .FadeInFromZero(300, Easing.OutQuint)
                     .ScaleTo(Vector2.One)
                     .ScaleTo(new Vector2(1.2f), 1800, Easing.OutQuint);
             }
 
-            this.FadeOutFromOne(800);
-
             ringExplosion?.PlayAnimation();
         }
 
diff --git a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
index ada651b60e..c7103cd9fd 100644
--- a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
+++ b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
@@ -45,11 +45,10 @@ namespace osu.Game.Rulesets.Judgements
             if (Result == HitResult.IgnoreMiss || Result == HitResult.LargeTickMiss)
             {
                 this.RotateTo(-45);
-                this.ScaleTo(1.8f);
+                this.ScaleTo(1.6f);
                 this.ScaleTo(1.2f, 100, Easing.In);
 
-                this.MoveTo(Vector2.Zero);
-                this.MoveToOffset(new Vector2(0, 10), 800, Easing.InQuint);
+                this.FadeOutFromOne(400);
             }
             else if (Result.IsMiss())
             {
@@ -61,9 +60,9 @@ namespace osu.Game.Rulesets.Judgements
 
                 this.RotateTo(0);
                 this.RotateTo(40, 800, Easing.InQuint);
-            }
 
-            this.FadeOutFromOne(800);
+                this.FadeOutFromOne(800);
+            }
         }
 
         public Drawable? GetAboveHitObjectsProxiedContent() => null;
diff --git a/osu.Game/Skinning/LegacyJudgementPieceOld.cs b/osu.Game/Skinning/LegacyJudgementPieceOld.cs
index 1834a17279..a9f68bd378 100644
--- a/osu.Game/Skinning/LegacyJudgementPieceOld.cs
+++ b/osu.Game/Skinning/LegacyJudgementPieceOld.cs
@@ -63,14 +63,10 @@ namespace osu.Game.Skinning
                 // missed ticks / slider end don't get the normal animation.
                 if (isMissedTick())
                 {
-                    this.ScaleTo(1.6f);
-                    this.ScaleTo(1, 100, Easing.In);
+                    this.ScaleTo(1.2f);
+                    this.ScaleTo(1f, 100, Easing.In);
 
-                    if (legacyVersion > 1.0m)
-                    {
-                        this.MoveTo(new Vector2(0, -2f));
-                        this.MoveToOffset(new Vector2(0, 10), fade_out_delay + fade_out_length, Easing.In);
-                    }
+                    this.FadeOutFromOne(400);
                 }
                 else
                 {

From 17d05b0fdfd392423c708bd368cd02a77116d0bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 22 Jan 2024 14:23:46 +0100
Subject: [PATCH 2/2] Fix non-miss drawable judgements fading out instantly on
 triangles skin

`else if` proves to be insidious once again.
---
 osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
index c7103cd9fd..7330f138ce 100644
--- a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
+++ b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
@@ -49,8 +49,10 @@ namespace osu.Game.Rulesets.Judgements
                 this.ScaleTo(1.2f, 100, Easing.In);
 
                 this.FadeOutFromOne(400);
+                return;
             }
-            else if (Result.IsMiss())
+
+            if (Result.IsMiss())
             {
                 this.ScaleTo(1.6f);
                 this.ScaleTo(1, 100, Easing.In);
@@ -60,9 +62,9 @@ namespace osu.Game.Rulesets.Judgements
 
                 this.RotateTo(0);
                 this.RotateTo(40, 800, Easing.InQuint);
-
-                this.FadeOutFromOne(800);
             }
+
+            this.FadeOutFromOne(800);
         }
 
         public Drawable? GetAboveHitObjectsProxiedContent() => null;