Add fade to banana's lighting as it approaches the catcher

This also avoids using the `UprightScalingContainer` (and allows for
scale adjust in the process).

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

@@ -5,9 +5,10 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics.Containers;
+using osu.Game.Rulesets.Catch.Objects;
 using osuTK;
 using osuTK.Graphics;
 
@@ -15,10 +16,14 @@ namespace osu.Game.Rulesets.Catch.Skinning.Argon
 {
     internal class ArgonBananaPiece : ArgonFruitPiece
     {
+        private Container stabilisedPieceContainer = null!;
+
+        protected override Drawable BorderPiece => stabilisedPieceContainer;
+
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddInternal(new UprightAspectMaintainingContainer
+            AddInternal(stabilisedPieceContainer = new Container
             {
                 RelativeSizeAxes = Axes.Both,
                 Anchor = Anchor.Centre,
@@ -44,7 +49,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Argon
                         Width = 1.6f,
                         Height = 2,
                     },
-                    new Box
+                    new Circle
                     {
                         Colour = ColourInfo.GradientHorizontal(Color4.White, Color4.White.Opacity(0)),
                         RelativeSizeAxes = Axes.X,
@@ -78,5 +83,15 @@ namespace osu.Game.Rulesets.Catch.Skinning.Argon
                 }
             });
         }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            float scale = 0.5f + 0.5f * (1 / (ObjectState.DisplaySize.X / (CatchHitObject.OBJECT_RADIUS * 2)));
+
+            stabilisedPieceContainer.Rotation = -ObjectState.DisplayRotation;
+            stabilisedPieceContainer.Scale = new Vector2(scale);
+        }
     }
 }

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

@@ -1,21 +1,19 @@
 // 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.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Default
 {
     public class BananaPiece : CatchHitObjectPiece
     {
-        protected override BorderPiece BorderPiece { get; }
+        protected override Drawable BorderPiece { get; }
 
         public BananaPiece()
         {
             RelativeSizeAxes = Axes.Both;
 
-            InternalChildren = new Drawable[]
+            InternalChildren = new[]
             {
                 new BananaPulpFormation
                 {

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

@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
         /// A part of this piece that will be faded out while falling in the playfield.
         /// </summary>
         [CanBeNull]
-        protected virtual BorderPiece BorderPiece => null;
+        protected virtual Drawable BorderPiece => null;
 
         /// <summary>
         /// A part of this piece that will be only visible when <see cref="HyperDash"/> is true.

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

@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
 
         public readonly Bindable<FruitVisualRepresentation> VisualRepresentation = new Bindable<FruitVisualRepresentation>();
 
-        protected override BorderPiece BorderPiece { get; }
+        protected override Drawable BorderPiece { get; }
         protected override Drawable HyperBorderPiece { get; }
 
         public FruitPiece()