new mania hold tail

osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHoldNoteTailPiece.cs

@@ -3,13 +3,13 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Colour;
 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.UI.Scrolling;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Skinning.Argon
@@ -19,45 +19,57 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
         private readonly IBindable<Color4> accentColour = new Bindable<Color4>();
 
-        private readonly Box colouredBox;
+        private readonly Container spriteContainer;
-        private readonly Box shadow;
+        private readonly Container shadeContainer;
+        private readonly Circle hitLine;
 
         public ArgonHoldNoteTailPiece()
         {
             RelativeSizeAxes = Axes.X;
-            Height = ArgonNotePiece.NOTE_HEIGHT;
+
+            // multiply by two so that the hold body extends up to the height of the note head accent
+            Height = ArgonNotePiece.NOTE_HEIGHT * ArgonNotePiece.NOTE_ACCENT_RATIO * 2;
 
             CornerRadius = ArgonNotePiece.CORNER_RADIUS;
             Masking = true;
 
             InternalChildren = new Drawable[]
             {
-                shadow = new Box
+                shadeContainer = new Container {
-                {
                     RelativeSizeAxes = Axes.Both,
-                },
+                    Height = 0.5f,
-                new Container
-                {
-                    Anchor = Anchor.BottomLeft,
-                    Origin = Anchor.BottomLeft,
-                    RelativeSizeAxes = Axes.Both,
-                    Height = 0.82f,
-                    Masking = true,
                     CornerRadius = ArgonNotePiece.CORNER_RADIUS,
+                    Masking = true,
+                    Children = new Drawable[] {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = Color4.Black,
+                            Alpha = 0.2f,
+                        },
+                    },
+                },
+                spriteContainer = new Container {
+                    RelativeSizeAxes = Axes.X,
+                    Height = ArgonNotePiece.NOTE_HEIGHT,
                     Children = new Drawable[]
                     {
-                        colouredBox = new Box
+                        new SpriteIcon
                         {
-                            RelativeSizeAxes = Axes.Both,
+                            Anchor = Anchor.Centre,
-                        }
+                            Origin = Anchor.Centre,
-                    }
+                            Y = 4,
+                            Icon = FontAwesome.Solid.AngleDown,
+                            Size = new Vector2(20),
+                            Scale = new Vector2(1, 0.7f),
+                            Colour = Color4.White,
+                            Alpha = 0.2f,
                         },
-                new Circle
+                    },
-                {
+                },
+                hitLine = new Circle {
                     RelativeSizeAxes = Axes.X,
                     Height = ArgonNotePiece.CORNER_RADIUS * 2,
-                    Anchor = Anchor.BottomLeft,
-                    Origin = Anchor.BottomLeft,
                 },
             };
         }
@@ -77,19 +89,17 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
 
         private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
         {
-            colouredBox.Anchor = colouredBox.Origin = direction.NewValue == ScrollingDirection.Up
+            hitLine.Anchor = hitLine.Origin =
+            spriteContainer.Anchor = spriteContainer.Origin =
+            shadeContainer.Anchor = shadeContainer.Origin =
+                direction.NewValue == ScrollingDirection.Up
                     ? Anchor.TopCentre
                     : Anchor.BottomCentre;
         }
 
         private void onAccentChanged(ValueChangedEvent<Color4> accent)
         {
-            colouredBox.Colour = ColourInfo.GradientVertical(
+            hitLine.Colour = accent.NewValue;
-                accent.NewValue,
-                accent.NewValue.Darken(0.1f)
-            );
-
-            shadow.Colour = accent.NewValue.Darken(0.5f);
         }
     }
 }

osu.Game.Rulesets.Mania/Skinning/Argon/ArgonNotePiece.cs

@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
     internal partial class ArgonNotePiece : CompositeDrawable
     {
         public const float NOTE_HEIGHT = 42;
-
+        public const float NOTE_ACCENT_RATIO = 0.82f;
         public const float CORNER_RADIUS = 3.4f;
 
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.BottomLeft,
                     RelativeSizeAxes = Axes.Both,
-                    Height = 0.82f,
+                    Height = NOTE_ACCENT_RATIO,
                     Masking = true,
                     CornerRadius = CORNER_RADIUS,
                     Children = new Drawable[]