Allow LN tail to have an origin of TopCentre

osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs

@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
     public abstract partial class ManiaSkinnableTestScene : SkinnableTestScene
     {
         [Cached(Type = typeof(IScrollingInfo))]
-        private readonly TestScrollingInfo scrollingInfo = new TestScrollingInfo();
+        protected readonly TestScrollingInfo ScrollingInfo = new TestScrollingInfo();
 
         [Cached]
         private readonly StageDefinition stage = new StageDefinition(4);
@@ -30,7 +30,7 @@ public abstract partial class ManiaSkinnableTestScene : SkinnableTestScene
 
         protected ManiaSkinnableTestScene()
         {
-            scrollingInfo.Direction.Value = ScrollingDirection.Down;
+            ScrollingInfo.Direction.Value = ScrollingDirection.Down;
 
             Add(new Box
             {
@@ -43,16 +43,16 @@ protected ManiaSkinnableTestScene()
         [Test]
         public void TestScrollingDown()
         {
-            AddStep("change direction to down", () => scrollingInfo.Direction.Value = ScrollingDirection.Down);
+            AddStep("change direction to down", () => ScrollingInfo.Direction.Value = ScrollingDirection.Down);
         }
 
         [Test]
         public void TestScrollingUp()
         {
-            AddStep("change direction to up", () => scrollingInfo.Direction.Value = ScrollingDirection.Up);
+            AddStep("change direction to up", () => ScrollingInfo.Direction.Value = ScrollingDirection.Up);
         }
 
-        private class TestScrollingInfo : IScrollingInfo
+        protected class TestScrollingInfo : IScrollingInfo
         {
             public readonly Bindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
 

osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs

@@ -10,6 +10,8 @@
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.Tests.Skinning
 {
@@ -37,6 +39,25 @@ public void TestFadeOnMiss()
             });
         }
 
+        [Test]
+        public void TestTailOrigin()
+        {
+            AddStep("set tail origin to regular", () =>
+            {
+                foreach (var holdNote in CreatedDrawables.SelectMany(d => d.ChildrenOfType<DrawableHoldNote>()))
+                    ((Bindable<HoldNoteTailOrigin>)holdNote.Tail.TailOrigin).Value = HoldNoteTailOrigin.Regular;
+            });
+            AddStep("change direction to down", () => ScrollingInfo.Direction.Value = ScrollingDirection.Down);
+            AddStep("change direction to up", () => ScrollingInfo.Direction.Value = ScrollingDirection.Up);
+            AddStep("set tail origin to inverted", () =>
+            {
+                foreach (var holdNote in CreatedDrawables.SelectMany(d => d.ChildrenOfType<DrawableHoldNote>()))
+                    ((Bindable<HoldNoteTailOrigin>)holdNote.Tail.TailOrigin).Value = HoldNoteTailOrigin.Inverted;
+            });
+            AddStep("change direction to down", () => ScrollingInfo.Direction.Value = ScrollingDirection.Down);
+            AddStep("change direction to up", () => ScrollingInfo.Direction.Value = ScrollingDirection.Up);
+        }
+
         private IEnumerable<DrawableHoldNote> holdNotes => CreatedDrawables.SelectMany(d => d.ChildrenOfType<DrawableHoldNote>());
 
         protected override DrawableManiaHitObject CreateHitObject()

osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs

@@ -239,7 +239,12 @@ protected override void Update()
             // Position and resize the body to lie half-way under the head and the tail notes.
             // The rationale for this is account for heads/tails with corner radius.
             bodyPiece.Y = (Direction.Value == ScrollingDirection.Up ? 1 : -1) * Head.Height / 2;
-            bodyPiece.Height = DrawHeight - Head.Height / 2 + Tail.Height / 2;
+            bodyPiece.Height = DrawHeight - Head.Height / 2;
+
+            if (Tail.TailOrigin.Value == HoldNoteTailOrigin.Inverted)
+                bodyPiece.Height -= Tail.Height / 2;
+            else
+                bodyPiece.Height += Tail.Height / 2;
 
             if (Time.Current >= HitObject.StartTime)
             {

osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs

@@ -3,9 +3,13 @@
 
 #nullable disable
 
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
+using osu.Game.Rulesets.Mania.Skinning;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
@@ -18,6 +22,10 @@ public partial class DrawableHoldNoteTail : DrawableNote
 
         protected internal DrawableHoldNote HoldNote => (DrawableHoldNote)ParentHitObject;
 
+        private readonly Bindable<HoldNoteTailOrigin> tailOrigin = new Bindable<HoldNoteTailOrigin>();
+
+        public IBindable<HoldNoteTailOrigin> TailOrigin => tailOrigin;
+
         public DrawableHoldNoteTail()
             : this(null)
         {
@@ -30,6 +38,12 @@ public DrawableHoldNoteTail(TailNote tailNote)
             Origin = Anchor.TopCentre;
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            tailOrigin.BindValueChanged(_ => updateTailOrigin(), true);
+        }
+
         public void UpdateResult() => base.UpdateResult(true);
 
         protected override void CheckForResult(bool userTriggered, double timeOffset) =>
@@ -52,5 +66,25 @@ protected override HitResult GetCappedResult(HitResult result)
         public override void OnReleased(KeyBindingReleaseEvent<ManiaAction> e)
         {
         }
+
+        protected override void ApplySkin(ISkinSource skin, bool allowFallback)
+        {
+            base.ApplySkin(skin, allowFallback);
+            tailOrigin.Value = skin.GetConfig<ManiaSkinConfigurationLookup, HoldNoteTailOrigin>(new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.HoldNoteTailOrigin))?.Value ?? HoldNoteTailOrigin.Regular;
+        }
+
+        protected override void OnDirectionChanged(ValueChangedEvent<ScrollingDirection> e)
+        {
+            base.OnDirectionChanged(e);
+            updateTailOrigin();
+        }
+
+        private void updateTailOrigin()
+        {
+            if (Direction.Value == ScrollingDirection.Up)
+                Origin = tailOrigin.Value == HoldNoteTailOrigin.Inverted ? Anchor.BottomCentre : Anchor.TopCentre;
+            else
+                Origin = tailOrigin.Value == HoldNoteTailOrigin.Inverted ? Anchor.TopCentre : Anchor.BottomCentre;
+        }
     }
 }

osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs

@@ -78,7 +78,6 @@ protected override void OnApply()
         protected override void OnDirectionChanged(ValueChangedEvent<ScrollingDirection> e)
         {
             base.OnDirectionChanged(e);
-
             headPiece.Anchor = headPiece.Origin = e.NewValue == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre;
         }
 

osu.Game/Skinning/HoldNoteTailOrigin.cs

@@ -0,0 +1,11 @@
+// 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.
+
+namespace osu.Game.Skinning
+{
+    public enum HoldNoteTailOrigin
+    {
+        Regular = 0,
+        Inverted = 1
+    }
+}

osu.Game/Skinning/LegacyManiaSkinConfiguration.cs

@@ -44,6 +44,7 @@ public class LegacyManiaSkinConfiguration : IHasCustomColours
         public bool KeysUnderNotes;
         public int LightFramePerSecond = 60;
 
+        public HoldNoteTailOrigin HoldNoteTailOrigin;
         public LegacyNoteBodyStyle? NoteBodyStyle;
 
         public LegacyManiaSkinConfiguration(int keys)

osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs

@@ -56,6 +56,7 @@ public enum LegacyManiaSkinConfigurationLookups
         HoldNoteBodyImage,
         HoldNoteLightImage,
         HoldNoteLightScale,
+        HoldNoteTailOrigin,
         WidthForNoteHeightScale,
         ExplosionImage,
         ExplosionScale,

osu.Game/Skinning/LegacyManiaSkinDecoder.cs

@@ -128,6 +128,11 @@ private void flushPendingLines()
                         currentConfig.LightFramePerSecond = lightFramePerSecond > 0 ? lightFramePerSecond : 24;
                         break;
 
+                    case "HoldNoteTailOrigin":
+                        if (Enum.TryParse<HoldNoteTailOrigin>(pair.Value, out var tailOrigin))
+                            currentConfig.HoldNoteTailOrigin = tailOrigin;
+                        break;
+
                     case string when pair.Key.StartsWith("Colour", StringComparison.Ordinal):
                         HandleColours(currentConfig, line, true);
                         break;

osu.Game/Skinning/LegacySkin.cs

@@ -235,6 +235,9 @@ protected override void ParseConfigurationStream(Stream stream)
 
                     return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnWidth[maniaLookup.ColumnIndex.Value] / LegacyManiaSkinConfiguration.DEFAULT_COLUMN_SIZE));
 
+                case LegacyManiaSkinConfigurationLookups.HoldNoteTailOrigin:
+                    return SkinUtils.As<TValue>(new Bindable<HoldNoteTailOrigin>(existing.HoldNoteTailOrigin));
+
                 case LegacyManiaSkinConfigurationLookups.KeyImage:
                     Debug.Assert(maniaLookup.ColumnIndex != null);
                     return SkinUtils.As<TValue>(getManiaImage(existing, $"KeyImage{maniaLookup.ColumnIndex}"));