sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-26 07:57:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

Update queue mode names

Browse Source
This commit is contained in:
Dan Balasescu 2021-11-19 18:28:43 +09:00
parent f3f8ac2c43
commit 4e625b78e2
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tests/Visual/Multiplayer/TestSceneFreeForAllQueueMode.cs → osu.Game.Tests/Visual/Multiplayer/TestSceneAllPlayersQueueMode.cs
View File

@ -12,9 +12,9 @@ using osuTK.Input;
namespace osu.Game.Tests.Visual.Multiplayer namespace osu.Game.Tests.Visual.Multiplayer
{ {
public class TestSceneFreeForAllQueueMode : QueueModeTestScene public class TestSceneAllPlayersQueueMode : QueueModeTestScene
{ {
protected override QueueMode Mode => QueueMode.FreeForAll; protected override QueueMode Mode => QueueMode.AllPlayers;
[Test] [Test]
public void TestFirstItemSelectedByDefault() public void TestFirstItemSelectedByDefault()

2
osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
View File

@ -588,7 +588,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
roomManager.AddServerSideRoom(new Room roomManager.AddServerSideRoom(new Room
{ {
Name = { Value = "Test Room" }, Name = { Value = "Test Room" },
QueueMode = { Value = QueueMode.FreeForAll }, QueueMode = { Value = QueueMode.AllPlayers },
Playlist = Playlist =
{ {
new PlaylistItem new PlaylistItem

8
osu.Game/Online/Multiplayer/QueueMode.cs
View File

@ -12,10 +12,10 @@ namespace osu.Game.Online.Multiplayer
[Description("Host only")] [Description("Host only")]
HostOnly, HostOnly,
[Description("Free-for-all")] [Description("All players")]
FreeForAll, AllPlayers,
[Description("Fair rotate")] [Description("All players (round robin)")]
FairRotate AllPlayersRR
} }
} }

4
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
View File

@ -392,8 +392,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
AddOrEditPlaylistButton.Alpha = client.IsHost ? 1 : 0; AddOrEditPlaylistButton.Alpha = client.IsHost ? 1 : 0;
break; break;
case QueueMode.FreeForAll: case QueueMode.AllPlayers:
case QueueMode.FairRotate: case QueueMode.AllPlayersRR:
AddOrEditPlaylistButton.Text = "Add beatmap"; AddOrEditPlaylistButton.Text = "Add beatmap";
AddOrEditPlaylistButton.Alpha = 1; AddOrEditPlaylistButton.Alpha = 1;
break; break;

2
osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
View File

@ -442,7 +442,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
newItem = room.Playlist.FirstOrDefault(i => !i.Expired) ?? room.Playlist.Last(); newItem = room.Playlist.FirstOrDefault(i => !i.Expired) ?? room.Playlist.Last();
break; break;
case QueueMode.FairRotate: case QueueMode.AllPlayersRR:
// Group playlist items by (user_id -> count_expired), and select the first available playlist item from a user that has available beatmaps where count_expired is the lowest. // Group playlist items by (user_id -> count_expired), and select the first available playlist item from a user that has available beatmaps where count_expired is the lowest.
throw new NotImplementedException(); throw new NotImplementedException();
} }