From e2046791c2aff7e07532016d8a771f5e4d3b1a3a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 7 Nov 2022 15:39:24 +0900
Subject: [PATCH] Add argon drum roll ticks

---
 .../Skinning/Argon/ArgonCentreCirclePiece.cs  |  2 +-
 .../Skinning/Argon/ArgonCirclePiece.cs        |  2 +
 .../Skinning/Argon/ArgonRimCirclePiece.cs     |  2 +-
 .../Skinning/Argon/ArgonTickPiece.cs          | 68 +++++++++++++++++++
 .../Argon/TaikoArgonSkinTransformer.cs        |  3 +
 5 files changed, 75 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonTickPiece.cs

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonCentreCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonCentreCirclePiece.cs
index f347863be9..551a5af078 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonCentreCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonCentreCirclePiece.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
                 Origin = Anchor.Centre,
                 RelativeSizeAxes = Axes.Both,
                 Icon = FontAwesome.Solid.AngleLeft,
-                Size = new Vector2(20 / 70f),
+                Size = new Vector2(ICON_SIZE),
                 Scale = new Vector2(0.8f, 1)
             });
         }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonCirclePiece.cs
index ba8ef12902..8ef7b71069 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonCirclePiece.cs
@@ -16,6 +16,8 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
 {
     public abstract class ArgonCirclePiece : BeatSyncedContainer
     {
+        public const float ICON_SIZE = 20 / 70f;
+
         private const double pre_beat_transition_time = 80;
 
         private const float flash_opacity = 0.3f;
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonRimCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonRimCirclePiece.cs
index 390f134d6f..fd81221be3 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonRimCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonRimCirclePiece.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
                 Origin = Anchor.Centre,
                 RelativeSizeAxes = Axes.Both,
                 Icon = FontAwesome.Solid.AngleLeft,
-                Size = new Vector2(20 / 70f),
+                Size = new Vector2(ICON_SIZE),
                 Scale = new Vector2(0.8f, 1)
             });
         }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonTickPiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonTickPiece.cs
new file mode 100644
index 0000000000..df63d4948e
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonTickPiece.cs
@@ -0,0 +1,68 @@
+// 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 osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Objects.Drawables;
+using osuTK;
+
+namespace osu.Game.Rulesets.Taiko.Skinning.Argon
+{
+    public class ArgonTickPiece : CompositeDrawable
+    {
+        private readonly Bindable<bool> isFirstTick = new Bindable<bool>();
+
+        public ArgonTickPiece()
+        {
+            const float tick_size = 1 / TaikoHitObject.DEFAULT_SIZE * ArgonCirclePiece.ICON_SIZE;
+
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
+            RelativeSizeAxes = Axes.Both;
+            FillMode = FillMode.Fit;
+            Size = new Vector2(tick_size);
+        }
+
+        [Resolved]
+        private DrawableHitObject drawableHitObject { get; set; } = null!;
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            if (drawableHitObject is DrawableDrumRollTick drumRollTick)
+                isFirstTick.BindTo(drumRollTick.IsFirstTick);
+
+            isFirstTick.BindValueChanged(first =>
+            {
+                if (first.NewValue)
+                {
+                    InternalChild = new Circle
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Both
+                    };
+                }
+                else
+                {
+                    InternalChild = new SpriteIcon
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Both,
+                        Icon = FontAwesome.Solid.AngleLeft,
+                        Scale = new Vector2(0.8f, 1)
+                    };
+                }
+            }, true);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/TaikoArgonSkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/TaikoArgonSkinTransformer.cs
index 64f733a969..6782ae67f9 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/TaikoArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/TaikoArgonSkinTransformer.cs
@@ -41,6 +41,9 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
 
                         case TaikoSkinComponents.DrumRollBody:
                             return new ArgonElongatedCirclePiece();
+
+                        case TaikoSkinComponents.DrumRollTick:
+                            return new ArgonTickPiece();
                     }
 
                     break;