From 8dfd36d227d9c9cbf736bff713762ffeb36f0d0f Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Sat, 15 Jun 2024 03:27:59 -0400 Subject: [PATCH] menu spam fixie --- checkstyle.json | 3 ++- source/funkin/ui/charSelect/CharSelectSubState.hx | 14 ++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/checkstyle.json b/checkstyle.json index 41f0a7998..6c463f75a 100644 --- a/checkstyle.json +++ b/checkstyle.json @@ -327,7 +327,8 @@ "INLINE", "DYNAMIC", "FINAL" - ] + ], + "severity": "IGNORE" }, "type": "ModifierOrder" }, diff --git a/source/funkin/ui/charSelect/CharSelectSubState.hx b/source/funkin/ui/charSelect/CharSelectSubState.hx index 19f00dc92..022db2909 100644 --- a/source/funkin/ui/charSelect/CharSelectSubState.hx +++ b/source/funkin/ui/charSelect/CharSelectSubState.hx @@ -69,7 +69,7 @@ class CharSelectSubState extends MusicBeatSubState availableChars.set(3, "pico"); } - override public function create() + override public function create():Void { super.create(); @@ -79,6 +79,8 @@ class CharSelectSubState extends MusicBeatSubState selectSound.volume = 0.7; FlxG.sound.defaultSoundGroup.add(selectSound); + Conductor.instance.forceBPM(90); + FunkinSound.playMusic('charSelect', { startingVolume: 0.0, @@ -343,11 +345,11 @@ class CharSelectSubState extends MusicBeatSubState var spamLeft:Bool = false; var spamRight:Bool = false; - override public function update(elapsed:Float) + override public function update(elapsed:Float):Void { super.update(elapsed); - // Conductor.update(); + Conductor.instance.update(); if (controls.UI_UP_R || controls.UI_DOWN_R || controls.UI_LEFT_R || controls.UI_RIGHT_R) selectSound.pitch = 1; @@ -503,7 +505,7 @@ class CharSelectSubState extends MusicBeatSubState cursorDarkBlue.y = MathUtil.coolLerp(cursorDarkBlue.y, cursorLocIntended.y, lerpAmnt * 0.2); } - function spamOnStep() + function spamOnStep():Void { if (spamUp || spamDown || spamLeft || spamRight) { @@ -534,7 +536,7 @@ class CharSelectSubState extends MusicBeatSubState } } - private function updateLockAnims() + private function updateLockAnims():Void { for (index => member in grpIcons.group.members) { @@ -572,7 +574,7 @@ class CharSelectSubState extends MusicBeatSubState } } - function getCurrentSelected() + function getCurrentSelected():Int { var tempX:Int = cursorX + 1; var tempY:Int = cursorY + 1;