Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-30 11:26:53 -05:00
Code Issues Projects Releases Packages Wiki Activity

fix oppenent freezing when !mustHitSection and no notes, dance only on downbeat

Browse source
This commit is contained in:
MtH 2021-03-14 20:46:44 +01:00
parent 367cb8b1cc
commit c3710025e1
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
source/PlayState.hx
View file

@ -2289,10 +2289,6 @@ class PlayState extends MusicBeatState
} }
// else // else
// Conductor.changeBPM(SONG.bpm); // Conductor.changeBPM(SONG.bpm);
// Dad doesnt interupt his own notes
if (SONG.notes[Math.floor(curStep / 16)].mustHitSection)
dad.dance();
} }
// FlxG.log.add('change bpm' + SONG.notes[Std.int(curStep / 16)].changeBPM); // FlxG.log.add('change bpm' + SONG.notes[Std.int(curStep / 16)].changeBPM);
wiggleShit.update(Conductor.crochet); wiggleShit.update(Conductor.crochet);
@ -2321,9 +2317,17 @@ class PlayState extends MusicBeatState
gf.dance(); gf.dance();
} }
if (!boyfriend.animation.curAnim.name.startsWith("sing")) if (curBeat % 2 == 0)
{ {
if (!boyfriend.animation.curAnim.name.startsWith("sing"))
boyfriend.playAnim('idle'); boyfriend.playAnim('idle');
if (!dad.animation.curAnim.name.startsWith("sing"))
dad.dance();
}
else if (dad.curCharacter == 'spooky')
{
if (!dad.animation.curAnim.name.startsWith("sing"))
dad.dance();
} }
if (curBeat % 8 == 7 && curSong == 'Bopeebo') if (curBeat % 8 == 7 && curSong == 'Bopeebo')