From 36e2f5c512783d9f542f23fb4e7a4b69efceaa59 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Sep 2022 19:48:27 +0900
Subject: [PATCH] Add argon hit target pieces

---
 .../Skinning/Argon/ArgonHitTarget.cs          | 33 +++++++++++++++++++
 .../Skinning/Argon/ArgonKeyArea.cs            | 27 +++++++++++++--
 .../Argon/ManiaArgonSkinTransformer.cs        |  3 ++
 3 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitTarget.cs

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitTarget.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitTarget.cs
new file mode 100644
index 0000000000..6518607c9d
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitTarget.cs
@@ -0,0 +1,33 @@
+// 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.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.Mania.Skinning.Default;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.Skinning.Argon
+{
+    public class ArgonHitTarget : CompositeDrawable
+    {
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            RelativeSizeAxes = Axes.X;
+            Height = DefaultNotePiece.NOTE_HEIGHT;
+
+            InternalChildren = new[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Alpha = 0.3f,
+                    Blending = BlendingParameters.Additive,
+                    Colour = Color4.White
+                },
+            };
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
index 63e00041b8..f2acc61416 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
@@ -26,6 +27,8 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
         private Container keyIcon = null!;
         private Drawable background = null!;
 
+        private Circle hitTargetLine = null!;
+
         [Resolved]
         private Column column { get; set; } = null!;
 
@@ -61,6 +64,15 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                         Origin = Anchor.TopCentre,
                         Children = new[]
                         {
+                            hitTargetLine = new Circle()
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.Centre,
+                                Colour = OsuColour.Gray(196 / 255f),
+                                Height = 4,
+                                Masking = true,
+                            },
                             new Circle
                             {
                                 Y = icon_vertical_offset,
@@ -149,13 +161,18 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
 
                 foreach (var circle in keyIcon.Children.OfType<CompositeDrawable>())
                 {
-                    circle.ScaleTo(0.9f, 50, Easing.OutQuint);
+                    if (circle != hitTargetLine)
+                        circle.ScaleTo(0.9f, 50, Easing.OutQuint);
 
                     circle.FadeColour(Color4.White, 50, Easing.OutQuint);
+
+                    // TODO: VERY TMPOERAOIRY.
+                    float f = circle == hitTargetLine ? 0.2f : (circle is Circle ? 0.05f : 0.2f);
+
                     circle.TransformTo(nameof(EdgeEffect), new EdgeEffectParameters
                     {
                         Type = EdgeEffectType.Glow,
-                        Colour = Color4.White.Opacity(circle is Circle ? 0.05f : 0.2f),
+                        Colour = Color4.White.Opacity(f),
                         Radius = 40,
                     }, 50, Easing.OutQuint);
                 }
@@ -175,7 +192,11 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                     circle.ScaleTo(1f, 200, Easing.OutQuint);
 
                     // TODO: temp lol
-                    if (circle is Circle)
+                    if (circle == hitTargetLine)
+                    {
+                        circle.FadeColour(OsuColour.Gray(196 / 255f), 800, Easing.OutQuint);
+                    }
+                    else if (circle is Circle)
                         circle.FadeColour(column.AccentColour, 800, Easing.OutQuint);
 
                     circle.TransformTo(nameof(EdgeEffect), new EdgeEffectParameters
diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
index 67dd484923..dab71a65c3 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
@@ -20,6 +20,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                 case ManiaSkinComponent maniaComponent:
                     switch (maniaComponent.Component)
                     {
+                        case ManiaSkinComponents.HitTarget:
+                            return new ArgonHitTarget();
+
                         case ManiaSkinComponents.KeyArea:
                             return new ArgonKeyArea();