Add argon fruit design

osu.Game.Rulesets.Catch/Skinning/Argon/ArgonFruitPiece.cs

@@ -0,0 +1,104 @@
+// 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.Framework.Graphics.Textures;
+using osu.Framework.Utils;
+using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Catch.Skinning.Default;
+using osu.Game.Rulesets.Catch.UI;
+using osuTK;
+
+namespace osu.Game.Rulesets.Catch.Skinning.Argon
+{
+    internal class ArgonFruitPiece : CatchHitObjectPiece
+    {
+        public readonly Bindable<FruitVisualRepresentation> VisualRepresentation = new Bindable<FruitVisualRepresentation>();
+
+        protected override Drawable HyperBorderPiece => hyperBorderPiece;
+
+        private Drawable hyperBorderPiece = null!;
+
+        private Container layers = null!;
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            Texture largeTexture = getTexture("A");
+
+            InternalChildren = new[]
+            {
+                new Circle
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(20),
+                },
+                layers = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        new Sprite
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Blending = BlendingParameters.Additive,
+                            Alpha = 0.15f,
+                            Texture = largeTexture
+                        },
+                        new Sprite
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Blending = BlendingParameters.Additive,
+                            Alpha = 0.5f,
+                            Texture = getTexture("B")
+                        },
+                        new Sprite
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Blending = BlendingParameters.Additive,
+                            Texture = getTexture("C")
+                        },
+                    }
+                },
+                hyperBorderPiece = new Sprite
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Colour = Catcher.DEFAULT_HYPER_DASH_COLOUR,
+                    Blending = BlendingParameters.Additive,
+                    Alpha = 0.15f,
+                    Texture = largeTexture,
+                },
+            };
+
+            Texture getTexture(string type) => textures.Get($"Gameplay/catch/blob-{type}{RNG.Next(1, 7)}");
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            IndexInBeatmap.BindValueChanged(index =>
+            {
+                VisualRepresentation.Value = Fruit.GetVisualRepresentation(index.NewValue);
+            }, true);
+
+            AccentColour.BindValueChanged(colour =>
+            {
+                foreach (var sprite in layers)
+                    sprite.Colour = colour.NewValue;
+            }, true);
+        }
+    }
+}

osu.Game.Rulesets.Catch/Skinning/Argon/CatchArgonSkinTransformer.cs

@@ -23,6 +23,9 @@ namespace osu.Game.Rulesets.Catch.Skinning.Argon
                     {
                         case CatchSkinComponents.Catcher:
                             return new ArgonCatcher();
+
+                        case CatchSkinComponents.Fruit:
+                            return new ArgonFruitPiece();
                     }
 
                     break;

osu.Game.Rulesets.Catch/Skinning/Default/CatchHitObjectPiece.cs

@@ -7,6 +7,7 @@ using System;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osuTK.Graphics;
@@ -32,7 +33,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
         /// A part of this piece that will be only visible when <see cref="HyperDash"/> is true.
         /// </summary>
         [CanBeNull]
-        protected virtual HyperBorderPiece HyperBorderPiece => null;
+        protected virtual Drawable HyperBorderPiece => null;
 
         protected override void LoadComplete()
         {

osu.Game.Rulesets.Catch/Skinning/Default/DropletPiece.cs

@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
 {
     public class DropletPiece : CatchHitObjectPiece
     {
-        protected override HyperBorderPiece HyperBorderPiece { get; }
+        protected override Drawable HyperBorderPiece { get; }
 
         public DropletPiece()
         {

osu.Game.Rulesets.Catch/Skinning/Default/FruitPiece.cs

@@ -19,13 +19,13 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
         public readonly Bindable<FruitVisualRepresentation> VisualRepresentation = new Bindable<FruitVisualRepresentation>();
 
         protected override BorderPiece BorderPiece { get; }
-        protected override HyperBorderPiece HyperBorderPiece { get; }
+        protected override Drawable HyperBorderPiece { get; }
 
         public FruitPiece()
         {
             RelativeSizeAxes = Axes.Both;
 
-            InternalChildren = new Drawable[]
+            InternalChildren = new[]
             {
                 new FruitPulpFormation
                 {