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

Revert "Include TriggeredFail in mods"

Browse Source 
This reverts commit 8da673ec24.
This commit is contained in:
Peter-io 2024-07-11 15:48:02 +02:00
parent 3a73fa49bf
commit 7fd6f3f32c
6 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Osu/Mods/OsuModTargetPractice.cs
View File

@ -103,13 +103,11 @@ namespace osu.Game.Rulesets.Osu.Mods
public bool RestartOnFail => false; public bool RestartOnFail => false;
public bool TriggeredFail { get; set; } = false;
public void ApplyToHealthProcessor(HealthProcessor healthProcessor) public void ApplyToHealthProcessor(HealthProcessor healthProcessor)
{ {
// Sudden death // Sudden death
healthProcessor.FailConditions += (_, result) healthProcessor.FailConditions += (_, result)
=> TriggeredFail = result.Type.AffectsCombo() => result.Type.AffectsCombo()
&& !result.IsHit; && !result.IsHit;
} }

2
osu.Game/Rulesets/Mods/ModCinema.cs
View File

@ -51,7 +51,5 @@ namespace osu.Game.Rulesets.Mods
public bool PerformFail() => false; public bool PerformFail() => false;
public bool RestartOnFail => false; public bool RestartOnFail => false;
public bool TriggeredFail => false;
} }
} }

8
osu.Game/Rulesets/Mods/ModEasyWithExtraLives.cs
View File

@ -35,11 +35,7 @@ namespace osu.Game.Rulesets.Mods
public bool PerformFail() public bool PerformFail()
{ {
if (retries == 0) if (retries == 0) return true;
{
TriggeredFail = true;
return true;
}
health.Value = health.MaxValue; health.Value = health.MaxValue;
retries--; retries--;
@ -49,8 +45,6 @@ namespace osu.Game.Rulesets.Mods
public bool RestartOnFail => false; public bool RestartOnFail => false;
public bool TriggeredFail { get; set; } = false;
public void ApplyToHealthProcessor(HealthProcessor healthProcessor) public void ApplyToHealthProcessor(HealthProcessor healthProcessor)
{ {
health.BindTo(healthProcessor.Health); health.BindTo(healthProcessor.Health);

8
osu.Game/Rulesets/Mods/ModFailCondition.cs
View File

@ -20,8 +20,6 @@ namespace osu.Game.Rulesets.Mods
public virtual bool RestartOnFail => Restart.Value; public virtual bool RestartOnFail => Restart.Value;
public virtual bool TriggeredFail { get; set; } = false;
private Action? triggerFailureDelegate; private Action? triggerFailureDelegate;
public void ApplyToHealthProcessor(HealthProcessor healthProcessor) public void ApplyToHealthProcessor(HealthProcessor healthProcessor)
@ -33,11 +31,7 @@ namespace osu.Game.Rulesets.Mods
/// <summary> /// <summary>
/// Immediately triggers a failure on the loaded <see cref="HealthProcessor"/>. /// Immediately triggers a failure on the loaded <see cref="HealthProcessor"/>.
/// </summary> /// </summary>
protected void TriggerFailure() protected void TriggerFailure() => triggerFailureDelegate?.Invoke();
{
TriggeredFail = true;
triggerFailureDelegate?.Invoke();
}
/// <summary> /// <summary>
/// Determines whether <paramref name="result"/> should trigger a failure. Called every time a /// Determines whether <paramref name="result"/> should trigger a failure. Called every time a

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

@ -31,8 +31,6 @@ namespace osu.Game.Rulesets.Mods
public bool RestartOnFail => false; public bool RestartOnFail => false;
public bool TriggeredFail => false;
public void ReadFromConfig(OsuConfigManager config) public void ReadFromConfig(OsuConfigManager config)
{ {
config.BindWith(OsuSetting.ShowHealthDisplayWhenCantFail, showHealthBar); config.BindWith(OsuSetting.ShowHealthDisplayWhenCantFail, showHealthBar);

2
osu.Game/Rulesets/Mods/ModSuddenDeath.cs
View File

@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Mods
public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModPerfect)).ToArray(); public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModPerfect)).ToArray();
protected override bool FailCondition(HealthProcessor healthProcessor, JudgementResult result) protected override bool FailCondition(HealthProcessor healthProcessor, JudgementResult result)
=> TriggeredFail = result.Type.AffectsCombo() => result.Type.AffectsCombo()
&& !result.IsHit; && !result.IsHit;
} }
} }