From 8e6ea2dd9b098aa41f32d54a3c953218aee459fd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 Dec 2023 17:32:30 +0900
Subject: [PATCH] Update argon and triangles to match display style

---
 .../Skinning/Argon/ArgonJudgementPiece.cs         | 11 ++++++++++-
 .../Rulesets/Judgements/DefaultJudgementPiece.cs  | 15 ++++++++++++++-
 osu.Game/Rulesets/Scoring/HitResult.cs            |  4 ++--
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs
index edeece0293..bb61bd37c1 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs
@@ -62,7 +62,16 @@ protected override SpriteText CreateJudgementText() =>
         /// </remarks>
         public virtual void PlayAnimation()
         {
-            if (Result.IsMiss())
+            if (Result == HitResult.IgnoreMiss || Result == HitResult.LargeTickMiss)
+            {
+                this.RotateTo(-45);
+                this.ScaleTo(1.8f);
+                this.ScaleTo(1.2f, 100, Easing.In);
+
+                this.MoveTo(Vector2.Zero);
+                this.MoveToOffset(new Vector2(0, 10), 800, Easing.InQuint);
+            }
+            else if (Result.IsMiss())
             {
                 this.ScaleTo(1.6f);
                 this.ScaleTo(1, 100, Easing.In);
diff --git a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
index 3c5e37f91c..ada651b60e 100644
--- a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
+++ b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
@@ -38,7 +38,20 @@ protected override SpriteText CreateJudgementText() =>
         /// </remarks>
         public virtual void PlayAnimation()
         {
-            if (Result != HitResult.None && !Result.IsHit())
+            // TODO: make these better. currently they are using a text `-` and it's not centered properly.
+            // Should be an explicit drawable.
+            //
+            // When this is done, remove the [Description] attributes from HitResults which were added for this purpose.
+            if (Result == HitResult.IgnoreMiss || Result == HitResult.LargeTickMiss)
+            {
+                this.RotateTo(-45);
+                this.ScaleTo(1.8f);
+                this.ScaleTo(1.2f, 100, Easing.In);
+
+                this.MoveTo(Vector2.Zero);
+                this.MoveToOffset(new Vector2(0, 10), 800, Easing.InQuint);
+            }
+            else if (Result.IsMiss())
             {
                 this.ScaleTo(1.6f);
                 this.ScaleTo(1, 100, Easing.In);
diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index e174ebd00f..2d55f1a649 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -86,7 +86,7 @@ public enum HitResult
         /// Indicates a large tick miss.
         /// </summary>
         [EnumMember(Value = "large_tick_miss")]
-        [Description(@"x")]
+        [Description("-")]
         [Order(10)]
         LargeTickMiss,
 
@@ -118,7 +118,7 @@ public enum HitResult
         /// Indicates a miss that should be ignored for scoring purposes.
         /// </summary>
         [EnumMember(Value = "ignore_miss")]
-        [Description("x")]
+        [Description("-")]
         [Order(13)]
         IgnoreMiss,