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

Revert "Display results after fail"

Browse Source 
This commit reverts 7815b3c7
This commit is contained in:
Henry Lin 2021-06-23 16:22:10 +08:00
parent e52a58c1bc
commit 5a031eada8
8 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
View File

@ -28,8 +28,6 @@ namespace osu.Game.Rulesets.Osu.Mods
public bool RestartOnFail => false;
public bool DisplayResultsOnFail => false;
private OsuInputManager inputManager;
private IFrameStableClock gameplayClock;

2
osu.Game.Rulesets.Osu/Mods/OsuModTarget.cs
View File

@ -51,8 +51,6 @@ namespace osu.Game.Rulesets.Osu.Mods
public bool RestartOnFail => false;
public bool DisplayResultsOnFail => true;
/// <summary>
/// Jump distance for circles in the last combo
/// </summary>

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

@ -18,10 +18,5 @@ namespace osu.Game.Rulesets.Mods
/// Whether we want to restart on fail. Only used if <see cref="PerformFail"/> returns true.
/// </summary>
bool RestartOnFail { get; }
/// <summary>
/// Whether to proceed to results screen on fail. Only used if <see cref="PerformFail"/> returns true and <see cref="RestartOnFail"/> is false.
/// </summary>
bool DisplayResultsOnFail { get; }
}
}

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

@ -24,8 +24,6 @@ namespace osu.Game.Rulesets.Mods
public bool RestartOnFail => false;
public bool DisplayResultsOnFail => false;
public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModFailCondition), typeof(ModNoFail) };
public override bool HasImplementation => GetType().GenericTypeArguments.Length == 0;

1
osu.Game/Rulesets/Mods/ModBlockFail.cs
View File

@ -17,7 +17,6 @@ namespace osu.Game.Rulesets.Mods
public bool PerformFail() => false;
public bool RestartOnFail => false;
public bool DisplayResultsOnFail => false;
public void ReadFromConfig(OsuConfigManager config)
{

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

@ -41,7 +41,6 @@ namespace osu.Game.Rulesets.Mods
}
public bool RestartOnFail => false;
public bool DisplayResultsOnFail => false;
public void ApplyToHealthProcessor(HealthProcessor healthProcessor)
{

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

@ -14,7 +14,6 @@ namespace osu.Game.Rulesets.Mods
public virtual bool PerformFail() => true;
public virtual bool RestartOnFail => true;
public virtual bool DisplayResultsOnFail => false;
public void ApplyToHealthProcessor(HealthProcessor healthProcessor)
{

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

@ -640,7 +640,7 @@ namespace osu.Game.Screens.Play
if (!this.IsCurrentScreen())
return;
if (!ScoreProcessor.HasCompleted.Value && !HealthProcessor.HasFailed)
if (!ScoreProcessor.HasCompleted.Value)
{
completionProgressDelegate?.Cancel();
completionProgressDelegate = null;
@ -653,7 +653,7 @@ namespace osu.Game.Screens.Play
throw new InvalidOperationException($"{nameof(updateCompletionState)} was fired more than once");
// Only show the completion screen if the player hasn't failed
if (HealthProcessor.HasFailed && !Mods.Value.OfType<IApplicableFailOverride>().Any(m => m.DisplayResultsOnFail))
if (HealthProcessor.HasFailed)
return;
ValidForResume = false;
@ -751,12 +751,6 @@ namespace osu.Game.Screens.Play
// Called back when the transform finishes
private void onFailComplete()
{
if (Mods.Value.OfType<IApplicableFailOverride>().Any(m => m.DisplayResultsOnFail))
{
updateCompletionState(true);
return;
}
GameplayClockContainer.Stop();
FailOverlay.Retries = RestartCount;