Ranked Play: Make cards draggable and reorderable

osu.Game.Tests/Visual/RankedPlay/TestSceneHandReplay.cs

@@ -75,14 +75,14 @@ public override void SetUpSteps()
         }
 
         private double flushInterval = 1000;
-        private double recordInterval = 25;
+        private double recordInterval = 50;
         private double fixedLatency;
         private double maxLatency;
 
         [Test]
         public void TestCardHandReplay()
         {
-            AddSliderStep("record interval", 0.0, 1000.0, 25.0, value =>
+            AddSliderStep("record interval", 0.0, 1000.0, 50.0, value =>
             {
                 recordInterval = value;
                 recreateRecorder();

osu.Game.Tests/Visual/RankedPlay/TestScenePlayerCardHand.cs

@@ -6,6 +6,7 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Testing;
 using osu.Game.Online.Multiplayer.MatchTypes.RankedPlay;
 using osu.Game.Overlays;
 using osu.Game.Screens.OnlinePlay.Matchmaking.RankedPlay;
@@ -33,12 +34,23 @@ private void load()
             };
         }
 
+        [SetUpSteps]
+        public void SetupSteps()
+        {
+            AddStep("reset card hand", () => Child = handOfCards = new PlayerHandOfCards
+            {
+                Anchor = Anchor.BottomCentre,
+                Origin = Anchor.BottomCentre,
+                RelativeSizeAxes = Axes.Both,
+                Height = 0.5f,
+            });
+        }
+
         [Test]
         public void TestSingleSelectionMode()
         {
             AddStep("add cards", () =>
             {
-                handOfCards.Clear();
                 for (int i = 0; i < 5; i++)
                     handOfCards.AddCard(new RankedPlayCardWithPlaylistItem(new RankedPlayCardItem()));
             });
@@ -59,7 +71,6 @@ public void TestMultiSelectionMode()
         {
             AddStep("add cards", () =>
             {
-                handOfCards.Clear();
                 for (int i = 0; i < 5; i++)
                     handOfCards.AddCard(new RankedPlayCardWithPlaylistItem(new RankedPlayCardItem()));
             });
@@ -84,7 +95,13 @@ public void TestCardCount()
 
                 AddStep($"{i} {"cards".Pluralize(i == 1)}", () =>
                 {
-                    handOfCards.Clear();
+                    Child = handOfCards = new PlayerHandOfCards
+                    {
+                        Anchor = Anchor.BottomCentre,
+                        Origin = Anchor.BottomCentre,
+                        RelativeSizeAxes = Axes.Both,
+                        Height = 0.5f,
+                    };
 
                     for (int j = 0; j < numCards; j++)
                         handOfCards.AddCard(new RankedPlayCardWithPlaylistItem(new RankedPlayCardItem()));
@@ -138,7 +155,6 @@ public void TestKeyboardSelectionMultiSelection()
         {
             AddStep("add cards", () =>
             {
-                handOfCards.Clear();
                 for (int i = 0; i < 5; i++)
                     handOfCards.AddCard(new RankedPlayCardWithPlaylistItem(new RankedPlayCardItem()));
             });
@@ -157,5 +173,24 @@ public void TestKeyboardSelectionMultiSelection()
                 AddAssert("card selected", () => handOfCards.Selection.Contains(handOfCards.Cards.ElementAt(i1).Card.Item));
             }
         }
+
+        [Test]
+        public void TestContract()
+        {
+            AddStep("add cards", () =>
+            {
+                for (int i = 0; i < 5; i++)
+                    handOfCards.AddCard(new RankedPlayCardWithPlaylistItem(new RankedPlayCardItem()));
+            });
+            AddWaitStep("wait", 5);
+            AddStep("contract", () => handOfCards.Contract());
+            AddWaitStep("wait", 5);
+            AddAssert(
+                "all cards outside bounds", () =>
+                    handOfCards
+                        .ChildrenOfType<HandOfCards.HandCard>()
+                        .All(card => !card.ScreenSpaceDrawQuad.AABBFloat.IntersectsWith(handOfCards.ScreenSpaceDrawQuad.AABBFloat))
+            );
+        }
     }
 }

osu.Game/Online/RankedPlay/RankedPlayCardState.cs

@@ -3,6 +3,7 @@
 
 using System;
 using MessagePack;
+using osuTK;
 
 namespace osu.Game.Online.RankedPlay
 {
@@ -18,5 +19,28 @@ public readonly record struct RankedPlayCardState
 
         [Key(2)]
         public required bool Selected { get; init; }
+
+        [Key(3)]
+        public required bool Dragged { get; init; }
+
+        [Key(4)]
+        public required int Order { get; init; }
+
+        [Key(5)]
+        public float DragX { get; init; }
+
+        [Key(6)]
+        public float DragY { get; init; }
+
+        [IgnoreMember]
+        public Vector2 DragPosition
+        {
+            get => new Vector2(DragX, DragY);
+            init
+            {
+                DragX = value.X;
+                DragY = value.Y;
+            }
+        }
     }
 }

osu.Game/Screens/OnlinePlay/Matchmaking/RankedPlay/Card/RankedPlayCard.SongPreview.cs

@@ -254,6 +254,7 @@ protected override void LoadComplete()
                             this.FadeOut(200);
                         }
                     }, true);
+                    FinishTransforms();
                 }
 
                 protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)

osu.Game/Screens/OnlinePlay/Matchmaking/RankedPlay/DiscardScreen.cs

@@ -81,6 +81,10 @@ private void load(AudioManager audio)
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                 },
+            ];
+
+            CenterColumn.Children =
+            [
                 discardButton = new ShearedButton
                 {
                     Name = "Discard Button",
@@ -89,11 +93,7 @@ private void load(AudioManager audio)
                     Width = 150,
                     Action = onDiscardButtonClicked,
                     Enabled = { Value = true },
-                }
-            ];
-
-            CenterColumn.Children =
-            [
+                },
                 playerHand = new PlayerHandOfCards
                 {
                     Anchor = Anchor.BottomCentre,
@@ -179,23 +179,23 @@ public override void OnEntering(RankedPlaySubScreen? previous)
         {
             base.OnEntering(previous);
 
-            var screenBottomCenter = new Vector2(DrawWidth / 2, DrawHeight);
-            int cardCount = 0;
+            double delay = 0;
+            const double stagger = 50;
 
             foreach (var card in matchInfo.PlayerCards)
             {
+                double currentDelay = delay;
+
                 playerHand.AddCard(card, c =>
                 {
-                    c.Position = ToSpaceOfOtherDrawable(screenBottomCenter, playerHand);
+                    c.Position = playerHand.BottomCardInsertPosition;
+                    c.DelayMovementOnEntering(currentDelay);
                 });
-                Scheduler.AddDelayed(() =>
-                {
-                    SamplePlaybackHelper.PlayWithRandomPitch(cardAddSample);
-                }, 50 * cardCount);
-                cardCount++;
-            }
 
-            playerHand.UpdateLayout(stagger: 50);
+                Scheduler.AddDelayed(() => SamplePlaybackHelper.PlayWithRandomPitch(cardAddSample), delay);
+
+                delay += stagger;
+            }
         }
 
         private void onCountdownStarted(MultiplayerCountdown countdown) => Scheduler.Add(() =>
@@ -297,8 +297,9 @@ private void cardAdded(RankedPlayCardWithPlaylistItem card)
             {
                 playerHand.AddCard(card, d =>
                 {
-                    d.Position = ToSpaceOfOtherDrawable(new Vector2(DrawWidth, DrawHeight * 0.5f), playerHand);
-                    d.Rotation = -30;
+                    // card should enter from centre-right of screen
+                    var cardEnterPosition = ToSpaceOfOtherDrawable(new Vector2(DrawWidth, DrawHeight * 0.5f), playerHand);
+                    d.SetupMovementForDrawnCard(cardEnterPosition);
                 });
 
                 SamplePlaybackHelper.PlayWithRandomPitch(cardAddSample);