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

Apply proposed naming changes

Browse Source
This commit is contained in:
Salman Ahmed
2022-05-04 17:08:41 +03:00
parent e9ecf26b6a
commit 20e277d2e5
13 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
View File

@ -25,7 +25,7 @@ namespace osu.Game.Screens.OnlinePlay
public new Func<Mod, bool> IsValidMod
{
get => base.IsValidMod;
set => base.IsValidMod = m => m.HasImplementation && m.IsPlayable(ModUsage.User) && value(m);
set => base.IsValidMod = m => m.HasImplementation && m.IsPlayable(ModUsage.SoloLocal) && value(m);
}
public FreeModSelectOverlay()

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

@ -95,8 +95,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
protected override bool IsValidMod(Mod mod) => base.IsValidMod(mod) && mod.IsPlayable(ModUsage.MultiplayerRoomWide);
protected override bool IsValidMod(Mod mod) => base.IsValidMod(mod) && mod.IsPlayable(ModUsage.MultiplayerGlobal);
protected override bool IsValidFreeMod(Mod mod) => base.IsValidFreeMod(mod) && mod.IsPlayable(ModUsage.MultiplayerPerPlayer);
protected override bool IsValidFreeMod(Mod mod) => base.IsValidFreeMod(mod) && mod.IsPlayable(ModUsage.MultiplayerLocal);
}
}

2
osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
View File

@ -170,7 +170,7 @@ namespace osu.Game.Screens.OnlinePlay
/// </summary>
/// <param name="mod">The <see cref="Mod"/> to check.</param>
/// <returns>Whether <paramref name="mod"/> is a valid mod for online play.</returns>
protected virtual bool IsValidMod(Mod mod) => mod.HasImplementation && ModUtils.FlattenMod(mod).All(m => m.IsPlayable(ModUsage.User));
protected virtual bool IsValidMod(Mod mod) => mod.HasImplementation && ModUtils.FlattenMod(mod).All(m => m.IsPlayable(ModUsage.SoloLocal));
/// <summary>
/// Checks whether a given <see cref="Mod"/> is valid for per-player free-mod selection.

2
osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
View File

@ -188,7 +188,7 @@ namespace osu.Game.Screens.Play.PlayerSettings
if (score.NewValue == null)
return;
if (score.NewValue.Mods.Any(m => !m.IsPlayable(ModUsage.User)))
if (score.NewValue.Mods.Any(m => !m.IsPlayable(ModUsage.SoloLocal)))
return;
var hitEvents = score.NewValue.HitEvents;

2
osu.Game/Screens/Play/SubmittingPlayer.cs
View File

@ -48,7 +48,7 @@ namespace osu.Game.Screens.Play
// Token request construction should happen post-load to allow derived classes to potentially prepare DI backings that are used to create the request.
var tcs = new TaskCompletionSource<bool>();
if (Mods.Value.Any(m => !m.IsPlayable(ModUsage.User)))
if (Mods.Value.Any(m => !m.IsPlayable(ModUsage.SoloLocal)))
{
handleTokenFailure(new InvalidOperationException("Non-user playable mod selected."));
return false;

2
osu.Game/Screens/Ranking/ResultsScreen.cs
View File

@ -146,7 +146,7 @@ namespace osu.Game.Screens.Ranking
if (Score != null)
{
// only show flair / animation when arriving after watching a play that isn't autoplay.
bool shouldFlair = player != null && Score.Mods.All(m => m.IsPlayable(ModUsage.User));
bool shouldFlair = player != null && Score.Mods.All(m => m.IsPlayable(ModUsage.SoloLocal));
ScorePanelList.AddScore(Score, shouldFlair);
}