From 927e8134720a7d4167d8ff9372ba503cd65d0c05 Mon Sep 17 00:00:00 2001 From: Derrick Timmermans Date: Sun, 29 Oct 2023 11:52:38 +0100 Subject: [PATCH] Disable ResumeOverlay Seems out of place, and requires further consideration --- .../UI/DrawableSentakkiRuleset.cs | 6 +-- .../UI/SentakkiResumeOverlay.cs | 38 ------------------- 2 files changed, 3 insertions(+), 41 deletions(-) diff --git a/osu.Game.Rulesets.Sentakki/UI/DrawableSentakkiRuleset.cs b/osu.Game.Rulesets.Sentakki/UI/DrawableSentakkiRuleset.cs index 46e689a3f..b6e912c17 100644 --- a/osu.Game.Rulesets.Sentakki/UI/DrawableSentakkiRuleset.cs +++ b/osu.Game.Rulesets.Sentakki/UI/DrawableSentakkiRuleset.cs @@ -132,15 +132,15 @@ public void OnReleased(KeyBindingReleaseEvent e) { } public override DrawableHitObject CreateDrawableRepresentation(SentakkiHitObject h) => null!; - protected override ResumeOverlay CreateResumeOverlay() => new SentakkiResumeOverlay(); + // protected override ResumeOverlay CreateResumeOverlay() => new SentakkiResumeOverlay(); protected override PassThroughInputManager CreateInputManager() => new SentakkiInputManager(Ruleset.RulesetInfo); - public override void RequestResume(Action continueResume) + /* public override void RequestResume(Action continueResume) { ResumeOverlay.GameplayCursor = Cursor; ResumeOverlay.ResumeAction = continueResume; ResumeOverlay.Show(); - } + } */ } } diff --git a/osu.Game.Rulesets.Sentakki/UI/SentakkiResumeOverlay.cs b/osu.Game.Rulesets.Sentakki/UI/SentakkiResumeOverlay.cs index f50bd3c65..d2eed4bda 100644 --- a/osu.Game.Rulesets.Sentakki/UI/SentakkiResumeOverlay.cs +++ b/osu.Game.Rulesets.Sentakki/UI/SentakkiResumeOverlay.cs @@ -26,22 +26,6 @@ public partial class SentakkiResumeOverlay : ResumeOverlay [Resolved] private DrawableSentakkiRuleset? drawableSentakkiRuleset { get; set; } - private readonly string[] supporterList = new[] - { - "Ayato_K", - "Bosch", - "Dubita", - "Ezz", - "Mae", - "Nutchapol", - "Shiuannie", - "Smoogipoo", - "Flutterish", - "Nooraldeen", - }.OrderBy(t => RNG.Next()).ToArray(); - - private static int currentSupporterIndex; - // We don't want the default message protected override LocalisableString Message => ""; @@ -54,8 +38,6 @@ public partial class SentakkiResumeOverlay : ResumeOverlay private readonly Bindable beatsLeft = new Bindable(4); private int barLength; - private OsuSpriteText supporterText = null!; - private SkinnableSound countSound = null!; private SentakkiCursorContainer? localCursorContainer; @@ -78,17 +60,6 @@ private void load(OsuColour colours) Origin = Anchor.Centre, ShadowColour = new Color4(0f, 0f, 0f, 0.25f) }, - supporterText = new OsuSpriteText - { - RelativePositionAxes = Axes.Both, - Font = OsuFont.Torus.With(size: 20), - Colour = Color4.White, - Y = -0.4f, - Anchor = Anchor.BottomCentre, - Origin = Anchor.BottomCentre, - Shadow = true, - ShadowColour = new Color4(0f, 0f, 0f, 0.25f) - }, countSound = new SkinnableSound(new SampleInfo("Gameplay/Taka")) }; @@ -108,7 +79,6 @@ protected override void PopIn() { base.PopIn(); - supporterText.Text = SentakkiResumeOverlayStrings.SentakkiSupportedBy(getRandomSupporter()); messageText.Text = SentakkiResumeOverlayStrings.GetReady; var currentTimingPoint = beatmap.Value.Beatmap.ControlPointInfo.TimingPointAt(beatmap.Value.Track.CurrentTime); @@ -140,14 +110,6 @@ protected override void PopOut() GameplayCursor?.ActiveCursor?.Show(); } - private string getRandomSupporter() - { - string tmp = supporterList[currentSupporterIndex++]; - if (currentSupporterIndex >= supporterList.Length) currentSupporterIndex = 0; - - return tmp; - } - private void onCountUpdated(ValueChangedEvent beatsLeft) { if (beatsLeft.NewValue < barLength && beatsLeft.NewValue < beatsLeft.OldValue)