sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-29 09:27:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

Hide ResumeOverlay when OsuModAutopilot is enabled

Browse Source
This commit is contained in:
Pasi4K5 2023-01-22 03:44:59 +01:00
parent 292fd345bc
commit 75a1a2ec2f
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
View File

@ -23,6 +23,7 @@ namespace osu.Game.Rulesets.Osu.Mods
public override ModType Type => ModType.Automation; public override ModType Type => ModType.Automation;
public override LocalisableString Description => @"Automatic cursor movement - just follow the rhythm."; public override LocalisableString Description => @"Automatic cursor movement - just follow the rhythm.";
public override double ScoreMultiplier => 0.1; public override double ScoreMultiplier => 0.1;
public override bool HidesResumeOverlay => true;
public override Type[] IncompatibleMods => new[] { typeof(OsuModSpunOut), typeof(ModRelax), typeof(ModFailCondition), typeof(ModNoFail), typeof(ModAutoplay), typeof(OsuModMagnetised), typeof(OsuModRepel) }; public override Type[] IncompatibleMods => new[] { typeof(OsuModSpunOut), typeof(ModRelax), typeof(ModFailCondition), typeof(ModNoFail), typeof(ModAutoplay), typeof(OsuModMagnetised), typeof(OsuModRepel) };
public bool PerformFail() => false; public bool PerformFail() => false;

3
osu.Game/Rulesets/Mods/Mod.cs
View File

@ -107,6 +107,9 @@ namespace osu.Game.Rulesets.Mods
[JsonIgnore] [JsonIgnore]
public virtual bool RequiresConfiguration => false; public virtual bool RequiresConfiguration => false;
[JsonIgnore]
public virtual bool HidesResumeOverlay => false;
/// <summary> /// <summary>
/// The mods this mod cannot be enabled with. /// The mods this mod cannot be enabled with.
/// </summary> /// </summary>

4
osu.Game/Rulesets/UI/DrawableRuleset.cs
View File

@ -230,7 +230,9 @@ namespace osu.Game.Rulesets.UI
public override void RequestResume(Action continueResume) public override void RequestResume(Action continueResume)
{ {
if (ResumeOverlay != null && (Cursor == null || (Cursor.LastFrameState == Visibility.Visible && Contains(Cursor.ActiveCursor.ScreenSpaceDrawQuad.Centre)))) if (ResumeOverlay != null
&& (Cursor == null || (Cursor.LastFrameState == Visibility.Visible && Contains(Cursor.ActiveCursor.ScreenSpaceDrawQuad.Centre)))
&& Mods.All(mod => !mod.HidesResumeOverlay))
{ {
ResumeOverlay.GameplayCursor = Cursor; ResumeOverlay.GameplayCursor = Cursor;
ResumeOverlay.ResumeAction = continueResume; ResumeOverlay.ResumeAction = continueResume;