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

Fix Cinema mod being compatible with mods that can force failure

Browse Source 
Addresses
https://github.com/ppy/osu/pull/26080#issuecomment-1868833214.
This commit is contained in:
Bartłomiej Dach 2024-01-08 22:34:41 +01:00
parent 70ba5dd0d3
commit aa83b84bb2
No known key found for this signature in database
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Mods
public override IconUsage? Icon => OsuIcon.ModCinema; public override IconUsage? Icon => OsuIcon.ModCinema;
public override LocalisableString Description => "Watch the video without visual distractions."; public override LocalisableString Description => "Watch the video without visual distractions.";
public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(ModAutoplay), typeof(ModNoFail) }).ToArray(); public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(ModAutoplay), typeof(ModNoFail), typeof(ModFailCondition) }).ToArray();
public void ApplyToHUD(HUDOverlay overlay) public void ApplyToHUD(HUDOverlay overlay)
{ {

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

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