h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 10:52:53 +08:00
Code Issues Releases Wiki Activity

Make both SD and PF auto-restart based on settings

Browse Source
This commit is contained in:
Paul Teng 2018-10-24 13:37:27 -04:00
parent d7d83a27d4
commit 794afa988f
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Rulesets/Mods/ModPerfect.cs
View File

@ -6,15 +6,13 @@ using osu.Game.Rulesets.Scoring;
namespace osu.Game.Rulesets.Mods
{
public abstract class ModPerfect : ModSuddenDeath, IApplicableRestartOnFail
public abstract class ModPerfect : ModSuddenDeath
{
public override string Name => "Perfect";
public override string ShortenedName => "PF";
public override FontAwesome Icon => FontAwesome.fa_osu_mod_perfect;
public override string Description => "SS or quit.";
public bool AllowRestart => true;
protected override bool FailCondition(ScoreProcessor scoreProcessor) => scoreProcessor.Accuracy.Value != 1;
}
}

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

@ -3,11 +3,13 @@
using System;
using osu.Game.Graphics;
using osu.Game.Configuration;
using osu.Game.Rulesets.Scoring;
using osu.Framework.Configuration;
namespace osu.Game.Rulesets.Mods
{
public abstract class ModSuddenDeath : Mod, IApplicableToScoreProcessor
public abstract class ModSuddenDeath : Mod, IReadFromConfig, IApplicableToScoreProcessor, IApplicableRestartOnFail
{
public override string Name => "Sudden Death";
public override string ShortenedName => "SD";
@ -18,11 +20,19 @@ namespace osu.Game.Rulesets.Mods
public override bool Ranked => true;
public override Type[] IncompatibleMods => new[] { typeof(ModNoFail), typeof(ModRelax), typeof(ModAutoplay) };
protected Bindable<bool> RestartOnFail = new Bindable<bool>();
public bool AllowRestart => RestartOnFail.Value;
public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)
{
scoreProcessor.FailConditions += FailCondition;
}
public void ReadFromConfig(OsuConfigManager config)
{
RestartOnFail = config.GetBindable<bool>(OsuSetting.RestartOnFail);
}
protected virtual bool FailCondition(ScoreProcessor scoreProcessor) => scoreProcessor.Combo.Value == 0;
}
}