Allow Relax to fail and remove failable mod exclusions

Allows the Relax mod to fail, and remove NF/PF/SD mod exclusion

ref: https://github.com/ppy/osu/discussions/13229
This commit is contained in:
rushiiMachine 2023-12-19 12:20:44 -08:00
parent 1ebb6262fd
commit 1b004dbebc
No known key found for this signature in database
GPG Key ID: DCBE5952BB3B6420
3 changed files with 4 additions and 4 deletions

View File

@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Mods
{
public abstract class ModFailCondition : Mod, IApplicableToHealthProcessor, IApplicableFailOverride
{
public override Type[] IncompatibleMods => new[] { typeof(ModNoFail), typeof(ModRelax) };
public override Type[] IncompatibleMods => new[] { typeof(ModBlockFail) };
[SettingSource("Restart on fail", "Automatically restarts when failed.")]
public BindableBool Restart { get; } = new BindableBool();

View File

@ -16,6 +16,6 @@ namespace osu.Game.Rulesets.Mods
public override ModType Type => ModType.DifficultyReduction;
public override LocalisableString Description => "You can't fail, no matter what.";
public override double ScoreMultiplier => 0.5;
public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModFailCondition) };
public override Type[] IncompatibleMods => new[] { typeof(ModFailCondition) };
}
}

View File

@ -7,13 +7,13 @@ using osu.Game.Graphics;
namespace osu.Game.Rulesets.Mods
{
public abstract class ModRelax : ModBlockFail
public abstract class ModRelax : Mod
{
public override string Name => "Relax";
public override string Acronym => "RX";
public override IconUsage? Icon => OsuIcon.ModRelax;
public override ModType Type => ModType.Automation;
public override double ScoreMultiplier => 0.1;
public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(ModNoFail), typeof(ModFailCondition) };
public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay) };
}
}