h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-07 01:43:25 +08:00
Code Issues Releases Wiki Activity

Minimal clean-up to get things bearable

Browse Source 
I plan to do a full refactor of `RoomSubScreen` at first opportunity.
This commit is contained in:
Dean Herbert 2025-01-29 20:02:01 +09:00
parent e8d0d2a1d9
commit bc930e8fd3
No known key found for this signature in database
1 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
View File

@ -4,6 +4,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Diagnostics;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Audio; using osu.Framework.Audio;
@ -49,18 +50,18 @@ namespace osu.Game.Screens.OnlinePlay.Match
/// A container that provides controls for selection of user mods. /// A container that provides controls for selection of user mods.
/// This will be shown/hidden automatically when applicable. /// This will be shown/hidden automatically when applicable.
/// </summary> /// </summary>
protected Drawable? UserModsSection; protected Drawable UserModsSection = null!;
/// <summary> /// <summary>
/// A container that provides controls for selection of the user style. /// A container that provides controls for selection of the user style.
/// This will be shown/hidden automatically when applicable. /// This will be shown/hidden automatically when applicable.
/// </summary> /// </summary>
protected Drawable? UserStyleSection; protected Drawable UserStyleSection = null!;
/// <summary> /// <summary>
/// A container that will display the user's style. /// A container that will display the user's style.
/// </summary> /// </summary>
protected Container<DrawableRoomPlaylistItem>? UserStyleDisplayContainer; protected Container<DrawableRoomPlaylistItem> UserStyleDisplayContainer = null!;
private Sample? sampleStart; private Sample? sampleStart;
@ -448,40 +449,44 @@ namespace osu.Game.Screens.OnlinePlay.Match
Mods.Value = GetGameplayMods().Select(m => m.ToMod(rulesetInstance)).ToArray(); Mods.Value = GetGameplayMods().Select(m => m.ToMod(rulesetInstance)).ToArray();
Ruleset.Value = GetGameplayRuleset(); Ruleset.Value = GetGameplayRuleset();
if (!item.AllowedMods.Any()) bool freeMod = item.AllowedMods.Any();
bool freeStyle = item.FreeStyle;
// For now, the game can never be in a state where freemod and freestyle are on at the same time.
// This will change, but due to the current implementation if this was to occur drawables will overlap so let's assert.
Debug.Assert(!freeMod || !freeStyle);
if (freeMod)
{ {
UserModsSection?.Hide(); UserModsSection.Show();
UserModsSelectOverlay.IsValidMod = m => allowedMods.Any(a => a.GetType() == m.GetType());
}
else
{
UserModsSection.Hide();
UserModsSelectOverlay.Hide(); UserModsSelectOverlay.Hide();
UserModsSelectOverlay.IsValidMod = _ => false; UserModsSelectOverlay.IsValidMod = _ => false;
} }
else
{
UserModsSection?.Show();
UserModsSelectOverlay.IsValidMod = m => allowedMods.Any(a => a.GetType() == m.GetType());
}
if (item.FreeStyle) if (freeStyle)
{ {
UserStyleSection?.Show(); UserStyleSection.Show();
if (UserStyleDisplayContainer != null) PlaylistItem gameplayItem = SelectedItem.Value.With(ruleset: GetGameplayRuleset().OnlineID, beatmap: new Optional<IBeatmapInfo>(GetGameplayBeatmap()));
PlaylistItem? currentItem = UserStyleDisplayContainer.SingleOrDefault()?.Item;
if (gameplayItem.Equals(currentItem))
return;
UserStyleDisplayContainer.Child = new DrawableRoomPlaylistItem(gameplayItem, true)
{ {
PlaylistItem gameplayItem = SelectedItem.Value.With(ruleset: GetGameplayRuleset().OnlineID, beatmap: new Optional<IBeatmapInfo>(GetGameplayBeatmap())); AllowReordering = false,
PlaylistItem? currentItem = UserStyleDisplayContainer.SingleOrDefault()?.Item; AllowEditing = freeStyle,
RequestEdit = _ => OpenStyleSelection()
if (gameplayItem.Equals(currentItem)) };
return;
UserStyleDisplayContainer.Child = new DrawableRoomPlaylistItem(gameplayItem, true)
{
AllowReordering = false,
AllowEditing = item.FreeStyle,
RequestEdit = _ => OpenStyleSelection()
};
}
} }
else else
UserStyleSection?.Hide(); UserStyleSection.Hide();
}); });
protected virtual APIMod[] GetGameplayMods() => UserMods.Value.Select(m => new APIMod(m)).Concat(SelectedItem.Value!.RequiredMods).ToArray(); protected virtual APIMod[] GetGameplayMods() => UserMods.Value.Select(m => new APIMod(m)).Concat(SelectedItem.Value!.RequiredMods).ToArray();