cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-11-22 13:13:47 +00:00
Code Issues Releases Wiki Activity

Merge pull request #187 from FunkinCrew/rewrite/bugfix/menu-spam

Browse source 
Fix spamming buttons on Pause/Freeplay breaking shit
This commit is contained in:
Cameron Taylor 2023-10-14 20:33:36 -04:00 committed by GitHub
parent c1684b218e f3737601f8
commit eb95f105d7
3 changed files with 35 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
source/funkin/FreeplayState.hx
View file

@ -570,7 +570,7 @@ class FreeplayState extends MusicBeatSubState
var randomCapsule:SongMenuItem = grpCapsules.recycle(SongMenuItem); var randomCapsule:SongMenuItem = grpCapsules.recycle(SongMenuItem);
randomCapsule.init(FlxG.width, 0, "Random"); randomCapsule.init(FlxG.width, 0, "Random");
randomCapsule.onConfirm = function() { randomCapsule.onConfirm = function() {
trace("RANDOM SELECTED"); capsuleOnConfirmRandom(randomCapsule);
}; };
randomCapsule.y = randomCapsule.intendedY(0) + 10; randomCapsule.y = randomCapsule.intendedY(0) + 10;
randomCapsule.targetPos.x = randomCapsule.x; randomCapsule.targetPos.x = randomCapsule.x;
@ -643,6 +643,8 @@ class FreeplayState extends MusicBeatSubState
var spamTimer:Float = 0; var spamTimer:Float = 0;
var spamming:Bool = false; var spamming:Bool = false;
var busy:Bool = false; // Set to true once the user has pressed enter to select a song.
override function update(elapsed:Float) override function update(elapsed:Float)
{ {
super.update(elapsed); super.update(elapsed);
@ -690,11 +692,13 @@ class FreeplayState extends MusicBeatSubState
fp.updateScore(Std.int(lerpScore)); fp.updateScore(Std.int(lerpScore));
txtCompletion.text = Math.floor(lerpCompletion * 100) + "%"; txtCompletion.text = Math.floor(lerpCompletion * 100) + "%";
// trace(Highscore.getCompletion(songs[curSelected].songName, curDifficulty));
// trace(intendedScore); handleInputs(elapsed);
// trace(lerpScore); }
// Highscore.getAllScores();
function handleInputs(elapsed:Float):Void
{
if (busy) return;
var upP = controls.UI_UP_P; var upP = controls.UI_UP_P;
var downP = controls.UI_DOWN_P; var downP = controls.UI_DOWN_P;
@ -949,6 +953,13 @@ class FreeplayState extends MusicBeatSubState
} }
} }
function capsuleOnConfirmRandom(cap:SongMenuItem):Void
{
trace("RANDOM SELECTED");
busy = true;
}
function capsuleOnConfirmDefault(cap:SongMenuItem):Void function capsuleOnConfirmDefault(cap:SongMenuItem):Void
{ {
// var poop:String = songs[curSelected].songName.toLowerCase(); // var poop:String = songs[curSelected].songName.toLowerCase();
@ -963,6 +974,8 @@ class FreeplayState extends MusicBeatSubState
curDifficulty = 1; curDifficulty = 1;
}*/ }*/
busy = true;
PlayStatePlaylist.isStoryMode = false; PlayStatePlaylist.isStoryMode = false;
var songId:String = cap.songTitle.toLowerCase(); var songId:String = cap.songTitle.toLowerCase();

12
source/funkin/PauseSubState.hx
View file

@ -150,6 +150,11 @@ class PauseSubState extends MusicBeatSubState
super.update(elapsed); super.update(elapsed);
handleInputs();
}
function handleInputs():Void
{
var upP = controls.UI_UP_P; var upP = controls.UI_UP_P;
var downP = controls.UI_DOWN_P; var downP = controls.UI_DOWN_P;
var accepted = controls.ACCEPT; var accepted = controls.ACCEPT;
@ -229,9 +234,14 @@ class PauseSubState extends MusicBeatSubState
FlxTransitionableState.skipNextTransIn = true; FlxTransitionableState.skipNextTransIn = true;
FlxTransitionableState.skipNextTransOut = true; FlxTransitionableState.skipNextTransOut = true;
if (PlayStatePlaylist.isStoryMode) openSubState(new funkin.ui.StickerSubState(null, STORY)); if (PlayStatePlaylist.isStoryMode)
{
openSubState(new funkin.ui.StickerSubState(null, STORY));
}
else else
{
openSubState(new funkin.ui.StickerSubState(null, FREEPLAY)); openSubState(new funkin.ui.StickerSubState(null, FREEPLAY));
}
case 'Exit to Chart Editor': case 'Exit to Chart Editor':
this.close(); this.close();

10
source/funkin/ui/StickerSubState.hx
View file

@ -206,6 +206,8 @@ class StickerSubState extends MusicBeatSubState
sticker.timing = FlxMath.remapToRange(ind, 0, grpStickers.members.length, 0, 0.9); sticker.timing = FlxMath.remapToRange(ind, 0, grpStickers.members.length, 0, 0.9);
new FlxTimer().start(sticker.timing, _ -> { new FlxTimer().start(sticker.timing, _ -> {
if (grpStickers == null) return;
sticker.visible = true; sticker.visible = true;
var daSound:String = FlxG.random.getObject(sounds); var daSound:String = FlxG.random.getObject(sounds);
FlxG.sound.play(Paths.sound(daSound)); FlxG.sound.play(Paths.sound(daSound));
@ -269,10 +271,10 @@ class StickerSubState extends MusicBeatSubState
{ {
super.update(elapsed); super.update(elapsed);
if (FlxG.keys.justPressed.ANY) // if (FlxG.keys.justPressed.ANY)
{ // {
regenStickers(); // regenStickers();
} // }
} }
var switchingState:Bool = false; var switchingState:Bool = false;