h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-29 06:27:34 +08:00
Code Issues Releases Wiki Activity

Remove option from settings

Browse Source
This commit is contained in:
Paul Teng 2018-10-29 08:19:38 -04:00
parent eaa035832e
commit cb9ec94dc2
3 changed files with 2 additions and 15 deletions
osu.Game
Configuration
OsuConfigManager.cs
Overlays/Settings/Sections/Gameplay
ModsSettings.cs
Rulesets/Mods
ModSuddenDeath.cs

2
osu.Game/Configuration/OsuConfigManager.cs

@ -84,7 +84,6 @@ namespace osu.Game.Configuration
Set(OsuSetting.ScoreDisplayMode, ScoringMode.Standardised); Set(OsuSetting.ScoreDisplayMode, ScoringMode.Standardised);
Set(OsuSetting.IncreaseFirstObjectVisibility, true); Set(OsuSetting.IncreaseFirstObjectVisibility, true);
Set(OsuSetting.RestartOnFail, false);
// Update // Update
Set(OsuSetting.ReleaseStream, ReleaseStream.Lazer); Set(OsuSetting.ReleaseStream, ReleaseStream.Lazer);
@ -149,7 +148,6 @@ namespace osu.Game.Configuration
BeatmapSkins, BeatmapSkins,
BeatmapHitsounds, BeatmapHitsounds,
IncreaseFirstObjectVisibility, IncreaseFirstObjectVisibility,
RestartOnFail,
ScoreDisplayMode ScoreDisplayMode
} }
} }

5
osu.Game/Overlays/Settings/Sections/Gameplay/ModsSettings.cs

@ -20,11 +20,6 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
LabelText = "Increase visibility of first object with \"Hidden\" mod", LabelText = "Increase visibility of first object with \"Hidden\" mod",
Bindable = config.GetBindable<bool>(OsuSetting.IncreaseFirstObjectVisibility) Bindable = config.GetBindable<bool>(OsuSetting.IncreaseFirstObjectVisibility)
}, },
new SettingsCheckbox
{
LabelText = "Restart on fail with \"Perfect\" and \"Sudden Death\" mod",
Bindable = config.GetBindable<bool>(OsuSetting.RestartOnFail)
},
}; };
} }
} }

10
osu.Game/Rulesets/Mods/ModSuddenDeath.cs

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