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

Merge pull request #26080 from peppy/cinema-no-fail

Browse Source 
Change "cinema" mod to never fail
This commit is contained in:
Bartłomiej Dach 2023-12-23 15:48:42 +01:00 committed by GitHub
commit a011a1ebb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,14 +23,14 @@ namespace osu.Game.Rulesets.Mods
}
}
public class ModCinema : ModAutoplay, IApplicableToHUD, IApplicableToPlayer
public class ModCinema : ModAutoplay, IApplicableToHUD, IApplicableToPlayer, IApplicableFailOverride
{
public override string Name => "Cinema";
public override string Acronym => "CN";
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)
{
@ -45,5 +45,9 @@ namespace osu.Game.Rulesets.Mods
player.BreakOverlay.Hide();
}
public bool PerformFail() => false;
public bool RestartOnFail => false;
}
}

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

@ -19,7 +19,7 @@ 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(ModFailCondition) };
public override Type[] IncompatibleMods => new[] { typeof(ModFailCondition), typeof(ModCinema) };
private readonly Bindable<bool> showHealthBar = new Bindable<bool>();