sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-02 22:26:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into auto-restart-mod-perfect

Browse Source 
# Conflicts:
#	osu.Game/Screens/Play/Player.cs
This commit is contained in:
smoogipoo
2019-09-19 17:53:10 +09:00
parent da15b900f7 558068a988
commit db24cfbead
18 changed files with 173 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Screens/Play/Player.cs
View File

@ -86,6 +86,12 @@ namespace osu.Game.Screens.Play
[Cached(Type = typeof(IBindable<IReadOnlyList<Mod>>))]
protected new readonly Bindable<IReadOnlyList<Mod>> Mods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
/// <summary>
/// Whether failing should be allowed.
/// By default, this checks whether all selected mods allow failing.
/// </summary>
protected virtual bool AllowFail => Mods.Value.OfType<IApplicableFailOverride>().All(m => m.AllowFail);
private readonly bool allowPause;
private readonly bool showResults;
@ -360,9 +366,7 @@ namespace osu.Game.Screens.Play
private bool onFail()
{
var failOverrideMods = Mods.Value.OfType<IApplicableFailOverride>();
if (failOverrideMods.Any(m => !m.AllowFail))
if (!AllowFail)
return false;
HasFailed = true;
@ -374,7 +378,8 @@ namespace osu.Game.Screens.Play
PauseOverlay.Hide();
failAnimation.Start();
if (failOverrideMods.Any(m => m.RestartOnFail))
if (Mods.Value.OfType<IApplicableFailOverride>().Any(m => m.RestartOnFail))
Restart();
return true;