Skip to content

Commit

Permalink
Disable ResumeOverlay
Browse files Browse the repository at this point in the history
Seems out of place, and requires further consideration
  • Loading branch information
LumpBloom7 committed Oct 29, 2023
1 parent 3a4e4db commit 927e813
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 41 deletions.
6 changes: 3 additions & 3 deletions osu.Game.Rulesets.Sentakki/UI/DrawableSentakkiRuleset.cs
Original file line number Diff line number Diff line change
Expand Up @@ -132,15 +132,15 @@ public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e) { }

public override DrawableHitObject<SentakkiHitObject> 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();
}
} */
}
}
38 changes: 0 additions & 38 deletions osu.Game.Rulesets.Sentakki/UI/SentakkiResumeOverlay.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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 => "";

Expand All @@ -54,8 +38,6 @@ public partial class SentakkiResumeOverlay : ResumeOverlay
private readonly Bindable<int> beatsLeft = new Bindable<int>(4);
private int barLength;

private OsuSpriteText supporterText = null!;

private SkinnableSound countSound = null!;

private SentakkiCursorContainer? localCursorContainer;
Expand All @@ -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"))
};

Expand All @@ -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);
Expand Down Expand Up @@ -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<int> beatsLeft)
{
if (beatsLeft.NewValue < barLength && beatsLeft.NewValue < beatsLeft.OldValue)
Expand Down

0 comments on commit 927e813

Please sign in to comment.