Merge pull request #9816 from voidedWarranties/duplicate-multi-room

osu.Game/Online/Multiplayer/Room.cs

@@ -103,6 +103,20 @@ namespace osu.Game.Online.Multiplayer
         [JsonIgnore]
         public readonly Bindable<int> Position = new Bindable<int>(-1);
 
+        /// <summary>
+        /// Create a copy of this room without online information.
+        /// Should be used to create a local copy of a room for submitting in the future.
+        /// </summary>
+        public Room CreateCopy()
+        {
+            var copy = new Room();
+
+            copy.CopyFrom(this);
+            copy.RoomID.Value = null;
+
+            return copy;
+        }
+
         public void CopyFrom(Room other)
         {
             RoomID.Value = other.RoomID.Value;

osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs

@@ -21,10 +21,12 @@ using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Components;
 using osuTK;
 using osuTK.Graphics;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.UserInterface;
 
 namespace osu.Game.Screens.Multi.Lounge.Components
 {
-    public class DrawableRoom : OsuClickableContainer, IStateful<SelectionState>, IFilterable
+    public class DrawableRoom : OsuClickableContainer, IStateful<SelectionState>, IFilterable, IHasContextMenu
     {
         public const float SELECTION_BORDER_WIDTH = 4;
         private const float corner_radius = 5;
@@ -39,6 +41,9 @@ namespace osu.Game.Screens.Multi.Lounge.Components
         private readonly Box selectionBox;
         private CachedModelDependencyContainer<Room> dependencies;
 
+        [Resolved(canBeNull: true)]
+        private Multiplayer multiplayer { get; set; }
+
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
@@ -232,5 +237,13 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                 Current = name;
             }
         }
+
+        public MenuItem[] ContextMenuItems => new MenuItem[]
+        {
+            new OsuMenuItem("Create copy", MenuItemType.Standard, () =>
+            {
+                multiplayer?.CreateRoom(Room.CreateCopy());
+            })
+        };
     }
 }

osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs

@@ -17,6 +17,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
 using osu.Game.Online.Multiplayer;
 using osuTK;
+using osu.Game.Graphics.Cursor;
 
 namespace osu.Game.Screens.Multi.Lounge.Components
 {
@@ -38,17 +39,25 @@ namespace osu.Game.Screens.Multi.Lounge.Components
         [Resolved]
         private IRoomManager roomManager { get; set; }
 
+        [Resolved(CanBeNull = true)]
+        private LoungeSubScreen loungeSubScreen { get; set; }
+
         public RoomsContainer()
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
-            InternalChild = roomFlow = new FillFlowContainer<DrawableRoom>
+            InternalChild = new OsuContextMenuContainer
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
-                Direction = FillDirection.Vertical,
-                Spacing = new Vector2(2),
+                Child = roomFlow = new FillFlowContainer<DrawableRoom>
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(2),
+                }
             };
         }
 

osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs

@@ -17,6 +17,7 @@ using osu.Game.Screens.Multi.Match;
 
 namespace osu.Game.Screens.Multi.Lounge
 {
+    [Cached]
     public class LoungeSubScreen : MultiplayerSubScreen
     {
         public override string Title => "Lounge";
@@ -125,7 +126,7 @@ namespace osu.Game.Screens.Multi.Lounge
             if (selectedRoom.Value?.RoomID.Value == null)
                 selectedRoom.Value = new Room();
 
-            music.EnsurePlayingSomething();
+            music?.EnsurePlayingSomething();
 
             onReturning();
         }

osu.Game/Screens/Multi/Multiplayer.cs

@@ -51,7 +51,7 @@ namespace osu.Game.Screens.Multi
         [Cached]
         private readonly Bindable<FilterCriteria> currentFilter = new Bindable<FilterCriteria>(new FilterCriteria());
 
-        [Resolved]
+        [Resolved(CanBeNull = true)]
         private MusicController music { get; set; }
 
         [Cached(Type = typeof(IRoomManager))]
@@ -134,7 +134,7 @@ namespace osu.Game.Screens.Multi
                     {
                         Anchor = Anchor.TopRight,
                         Origin = Anchor.TopRight,
-                        Action = createRoom
+                        Action = () => CreateRoom()
                     },
                     roomManager = new RoomManager()
                 }
@@ -289,10 +289,11 @@ namespace osu.Game.Screens.Multi
             logo.Delay(WaveContainer.DISAPPEAR_DURATION / 2).FadeOut();
         }
 
-        private void createRoom()
-        {
-            loungeSubScreen.Open(new Room { Name = { Value = $"{api.LocalUser}'s awesome room" } });
-        }
+        /// <summary>
+        /// Create a new room.
+        /// </summary>
+        /// <param name="room">An optional template to use when creating the room.</param>
+        public void CreateRoom(Room room = null) => loungeSubScreen.Open(room ?? new Room { Name = { Value = $"{api.LocalUser}'s awesome room" } });
 
         private void beginHandlingTrack()
         {
@@ -350,7 +351,7 @@ namespace osu.Game.Screens.Multi
                     track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
                     track.Looping = true;
 
-                    music.EnsurePlayingSomething();
+                    music?.EnsurePlayingSomething();
                 }
             }
             else