Skip to content

Commit

Permalink
Make cinema mod incompatible with no fail
Browse files Browse the repository at this point in the history
  • Loading branch information
bdach committed Dec 23, 2023
1 parent 15a9740 commit 0cbf594
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion osu.Game/Rulesets/Mods/ModCinema.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class ModCinema : ModAutoplay, IApplicableToHUD, IApplicableToPlayer, IAp
public override IconUsage? Icon => OsuIcon.ModCinema;
public override LocalisableString Description => "Watch the video without visual distractions.";

public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModAutoplay)).ToArray();
public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(ModAutoplay), typeof(ModNoFail) }).ToArray();

public void ApplyToHUD(HUDOverlay overlay)
{
Expand Down
2 changes: 1 addition & 1 deletion osu.Game/Rulesets/Mods/ModNoFail.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public abstract class ModNoFail : Mod, IApplicableFailOverride, IApplicableToHUD
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(ModFailCondition) };
public override Type[] IncompatibleMods => new[] { typeof(ModFailCondition), typeof(ModCinema) };

private readonly Bindable<bool> showHealthBar = new Bindable<bool>();

Expand Down

0 comments on commit 0cbf594

Please sign in to comment.