h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-30 11:30:36 +08:00
Code Issues Releases Wiki Activity

Fix incorrect default room types

Browse Source
This commit is contained in:
Dan Balasescu
2025-09-24 14:09:50 +09:00
Unverified
parent 9df3bd9a98
commit 83dafb4ef9
12 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game.Tests/Visual/Matchmaking/TestSceneIdleScreen.cs
+2 -1
View File
@@ -10,6 +10,7 @@ using osu.Framework.Screens;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Online.Multiplayer;
using osu.Game.Online.Multiplayer.MatchTypes.Matchmaking;
using osu.Game.Online.Rooms;
using osu.Game.Screens.OnlinePlay.Matchmaking.Screens.Idle;
using osu.Game.Tests.Visual.Multiplayer;
using osuTK;
@@ -26,7 +27,7 @@ namespace osu.Game.Tests.Visual.Matchmaking
{
base.SetUpSteps();
AddStep("join room", () => JoinRoom(CreateDefaultRoom()));
AddStep("join room", () => JoinRoom(CreateDefaultRoom(MatchType.Matchmaking)));
WaitForJoined();
AddStep("add list", () =>
osu.Game.Tests/Visual/Matchmaking/TestSceneMatchmakingScreen.cs
+1 -2
View File
@@ -35,8 +35,7 @@ namespace osu.Game.Tests.Visual.Matchmaking
AddStep("join room", () =>
{
var room = CreateDefaultRoom();
room.Type = MatchType.Matchmaking;
var room = CreateDefaultRoom(MatchType.Matchmaking);
room.Playlist = Enumerable.Range(1, 50).Select(i => new PlaylistItem(new MultiplayerPlaylistItem
{
ID = i,
osu.Game.Tests/Visual/Matchmaking/TestSceneMatchmakingScreenStack.cs
+1 -1
View File
@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual.Matchmaking
AddStep("join room", () =>
{
var room = CreateDefaultRoom();
var room = CreateDefaultRoom(MatchType.Matchmaking);
room.Playlist = Enumerable.Range(1, 50).Select(i => new PlaylistItem(new MultiplayerPlaylistItem
{
ID = i,
osu.Game.Tests/Visual/Matchmaking/TestScenePickScreen.cs
+1 -1
View File
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.Visual.Matchmaking
AddStep("join room", () =>
{
var room = CreateDefaultRoom();
var room = CreateDefaultRoom(MatchType.Matchmaking);
room.Playlist = items;
JoinRoom(room);
osu.Game.Tests/Visual/Matchmaking/TestScenePlayerPanel.cs
+2 -1
View File
@@ -7,6 +7,7 @@ using osu.Framework.Graphics;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Online.Multiplayer;
using osu.Game.Online.Multiplayer.MatchTypes.Matchmaking;
using osu.Game.Online.Rooms;
using osu.Game.Screens.OnlinePlay.Matchmaking;
using osu.Game.Tests.Visual.Multiplayer;
using osu.Game.Users;
@@ -21,7 +22,7 @@ namespace osu.Game.Tests.Visual.Matchmaking
{
base.SetUpSteps();
AddStep("join room", () => JoinRoom(CreateDefaultRoom()));
AddStep("join room", () => JoinRoom(CreateDefaultRoom(MatchType.Matchmaking)));
WaitForJoined();
AddStep("add panel", () => Child = panel = new PlayerPanel(new MultiplayerRoomUser(1)
osu.Game.Tests/Visual/Matchmaking/TestScenePlayerPanelList.cs
+2 -1
View File
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Online.Multiplayer;
using osu.Game.Online.Multiplayer.MatchTypes.Matchmaking;
using osu.Game.Online.Rooms;
using osu.Game.Screens.OnlinePlay.Matchmaking;
using osu.Game.Tests.Visual.Multiplayer;
using osuTK;
@@ -24,7 +25,7 @@ namespace osu.Game.Tests.Visual.Matchmaking
{
base.SetUpSteps();
AddStep("join room", () => JoinRoom(CreateDefaultRoom()));
AddStep("join room", () => JoinRoom(CreateDefaultRoom(MatchType.Matchmaking)));
WaitForJoined();
AddStep("add list", () => Child = new Container
osu.Game.Tests/Visual/Matchmaking/TestSceneResultsScreen.cs
+2 -1
View File
@@ -8,6 +8,7 @@ using osu.Framework.Screens;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Online.Multiplayer;
using osu.Game.Online.Multiplayer.MatchTypes.Matchmaking;
using osu.Game.Online.Rooms;
using osu.Game.Rulesets.Scoring;
using osu.Game.Screens.OnlinePlay.Matchmaking.Screens.Results;
using osu.Game.Tests.Visual.Multiplayer;
@@ -23,7 +24,7 @@ namespace osu.Game.Tests.Visual.Matchmaking
{
base.SetUpSteps();
AddStep("join room", () => JoinRoom(CreateDefaultRoom()));
AddStep("join room", () => JoinRoom(CreateDefaultRoom(MatchType.Matchmaking)));
WaitForJoined();
AddStep("add results screen", () =>
osu.Game.Tests/Visual/Matchmaking/TestSceneRoundResultsScreen.cs
+1 -1
View File
@@ -25,7 +25,7 @@ namespace osu.Game.Tests.Visual.Matchmaking
{
base.SetUpSteps();
AddStep("join room", () => JoinRoom(CreateDefaultRoom()));
AddStep("join room", () => JoinRoom(CreateDefaultRoom(MatchType.Matchmaking)));
WaitForJoined();
setupRequestHandler();
osu.Game.Tests/Visual/Matchmaking/TestSceneStageBubble.cs
+2 -1
View File
@@ -8,6 +8,7 @@ using osu.Framework.Graphics;
using osu.Game.Online.Matchmaking;
using osu.Game.Online.Multiplayer;
using osu.Game.Online.Multiplayer.MatchTypes.Matchmaking;
using osu.Game.Online.Rooms;
using osu.Game.Screens.OnlinePlay.Matchmaking;
using osu.Game.Tests.Visual.Multiplayer;
@@ -19,7 +20,7 @@ namespace osu.Game.Tests.Visual.Matchmaking
{
base.SetUpSteps();
AddStep("join room", () => JoinRoom(CreateDefaultRoom()));
AddStep("join room", () => JoinRoom(CreateDefaultRoom(MatchType.Matchmaking)));
WaitForJoined();
AddStep("add bubble", () => Child = new StageBubble(MatchmakingStage.RoundWarmupTime, "Next Round")
osu.Game.Tests/Visual/Matchmaking/TestSceneStageDisplay.cs
+2 -1
View File
@@ -6,6 +6,7 @@ using NUnit.Framework;
using osu.Framework.Extensions;
using osu.Framework.Graphics;
using osu.Game.Online.Multiplayer.MatchTypes.Matchmaking;
using osu.Game.Online.Rooms;
using osu.Game.Screens.OnlinePlay.Matchmaking;
using osu.Game.Tests.Visual.Multiplayer;
@@ -17,7 +18,7 @@ namespace osu.Game.Tests.Visual.Matchmaking
{
base.SetUpSteps();
AddStep("join room", () => JoinRoom(CreateDefaultRoom()));
AddStep("join room", () => JoinRoom(CreateDefaultRoom(MatchType.Matchmaking)));
WaitForJoined();
AddStep("add bubble", () => Child = new StageDisplay
osu.Game.Tests/Visual/Matchmaking/TestSceneStageText.cs
+2 -1
View File
@@ -6,6 +6,7 @@ using NUnit.Framework;
using osu.Framework.Extensions;
using osu.Framework.Graphics;
using osu.Game.Online.Multiplayer.MatchTypes.Matchmaking;
using osu.Game.Online.Rooms;
using osu.Game.Screens.OnlinePlay.Matchmaking;
using osu.Game.Tests.Visual.Multiplayer;
@@ -17,7 +18,7 @@ namespace osu.Game.Tests.Visual.Matchmaking
{
base.SetUpSteps();
AddStep("join room", () => JoinRoom(CreateDefaultRoom()));
AddStep("join room", () => JoinRoom(CreateDefaultRoom(MatchType.Matchmaking)));
WaitForJoined();
AddStep("create display", () => Child = new StageText
osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
+2 -2
View File
@@ -24,12 +24,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
public bool RoomJoined => MultiplayerClient.RoomJoined;
protected Room CreateDefaultRoom()
protected Room CreateDefaultRoom(MatchType type = MatchType.HeadToHead)
{
return new Room
{
Name = "test name",
Type = MatchType.HeadToHead,
Type = type,
Playlist =
[
new PlaylistItem(new TestBeatmap(Ruleset.Value).BeatmapInfo)