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

Prevent non-combo affecting judgements from triggering sudden death

Browse Source
This commit is contained in:
David Zhao
2019-06-21 14:29:16 +09:00
parent d5a7b839ee
commit de59e038ac
5 changed files with 74 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Scoring
/// <summary>
/// Additional conditions on top of <see cref="DefaultFailCondition"/> that cause a failing state.
/// </summary>
public event Func<ScoreProcessor, bool> FailConditions;
public event Func<ScoreProcessor, JudgementResult, bool> FailConditions;
/// <summary>
/// The current total score.
@ -151,12 +151,12 @@ namespace osu.Game.Rulesets.Scoring
/// This can only ever notify subscribers once.
/// </para>
/// </summary>
protected void UpdateFailed()
protected void UpdateFailed(JudgementResult result)
{
if (HasFailed)
return;
if (!DefaultFailCondition && FailConditions?.Invoke(this) != true)
if (!DefaultFailCondition && FailConditions?.Invoke(this, result) != true)
return;
if (Failed?.Invoke() != false)
@ -287,7 +287,7 @@ namespace osu.Game.Rulesets.Scoring
ApplyResult(result);
updateScore();
UpdateFailed();
UpdateFailed(result);
NotifyNewJudgement(result);
}