h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-22 03:52:54 +08:00
Code Issues Releases Wiki Activity

Implement NoFail mod

Browse Source
This commit is contained in:
Dean Herbert 2017-08-05 11:59:58 +09:00
parent 3416925233
commit 224de9cc1e
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Rulesets/Mods/Mod.cs
View File

@ -45,5 +45,10 @@ namespace osu.Game.Rulesets.Mods
/// The mods this mod cannot be enabled with. /// The mods this mod cannot be enabled with.
/// </summary> /// </summary>
public virtual Type[] IncompatibleMods => new Type[] { }; public virtual Type[] IncompatibleMods => new Type[] { };
/// <summary>
/// Whether we should allow fails at the
/// </summary>
public virtual bool AllowFail => true;
} }
} }

5
osu.Game/Rulesets/Mods/ModNoFail.cs
View File

@ -15,5 +15,10 @@ namespace osu.Game.Rulesets.Mods
public override double ScoreMultiplier => 0.5; public override double ScoreMultiplier => 0.5;
public override bool Ranked => true; public override bool Ranked => true;
public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModAutoplay) }; public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModAutoplay) };
/// <summary>
/// We never fail, 'yo.
/// </summary>
public override bool AllowFail => false;
} }
} }

7
osu.Game/Rulesets/Scoring/ScoreProcessor.cs
View File

@ -16,8 +16,9 @@ namespace osu.Game.Rulesets.Scoring
{ {
/// <summary> /// <summary>
/// Invoked when the ScoreProcessor is in a failed state. /// Invoked when the ScoreProcessor is in a failed state.
/// Return true if the fail was permitted.
/// </summary> /// </summary>
public event Action Failed; public event Func<bool> Failed;
/// <summary> /// <summary>
/// Invoked when a new judgement has occurred. This occurs after the judgement has been processed by the <see cref="ScoreProcessor"/>. /// Invoked when a new judgement has occurred. This occurs after the judgement has been processed by the <see cref="ScoreProcessor"/>.
@ -106,8 +107,8 @@ namespace osu.Game.Rulesets.Scoring
if (alreadyFailed || !HasFailed) if (alreadyFailed || !HasFailed)
return; return;
alreadyFailed = true; if (Failed?.Invoke() != false)
Failed?.Invoke(); alreadyFailed = true;
} }
/// <summary> /// <summary>

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

@ -238,13 +238,17 @@ namespace osu.Game.Screens.Play
} }
} }
private void onFail() private bool onFail()
{ {
if (Beatmap.Value.Mods.Value.Any(m => !m.AllowFail))
return false;
decoupledClock.Stop(); decoupledClock.Stop();
HasFailed = true; HasFailed = true;
failOverlay.Retries = RestartCount; failOverlay.Retries = RestartCount;
failOverlay.Show(); failOverlay.Show();
return true;
} }
protected override void OnEntering(Screen last) protected override void OnEntering(Screen last)