diff --git a/source/PlayState.hx b/source/PlayState.hx index 921c87b..aee75b2 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -3999,7 +3999,7 @@ class PlayState extends MusicBeatState FlxG.stage.window.onFocusIn.add(focusIn); var ourSource:String = "assets/videos/daWeirdVid/dontDelete.webm"; - WebmPlayer.SKIP_STEP_LIMIT = 90; + //WebmPlayer.SKIP_STEP_LIMIT = 90; var str1:String = "WEBM SHIT"; webmHandler = new WebmHandler(); webmHandler.source(ourSource); @@ -4462,13 +4462,13 @@ class PlayState extends MusicBeatState if (curSong == 'Tutorial' && dad.curCharacter == 'gf') { - if (curStep < 64 || SONG.notes[Math.floor(curStep / 16)].mustHitSection) + if (SONG.notes[Math.floor(curStep / 16)].mustHitSection) dad.dance(); else { - if (curStep % 2 == 0 && dad.animOffsets.exists('danceLeft')) + if (curBeat == 73 || curBeat % 4 == 0 || curBeat % 4 == 1) dad.playAnim('danceLeft', true); - else if (curStep % 2 == 1 && dad.animOffsets.exists('danceRight')) + else dad.playAnim('danceRight', true); } } @@ -4480,7 +4480,7 @@ class PlayState extends MusicBeatState // Dad doesnt interupt his own notes if ((SONG.notes[Math.floor(curStep / 16)].mustHitSection || !dad.animation.curAnim.name.startsWith("sing")) && dad.curCharacter != 'gf') - if (curBeat % idleBeat == 0 || dad.curCharacter == "spooky") + if ((curBeat % idleBeat == 0 || !idleToBeat) || dad.curCharacter == "spooky") dad.dance(idleToBeat); } // FlxG.log.add('change bpm' + SONG.notes[Std.int(curStep / 16)].changeBPM); @@ -4513,7 +4513,7 @@ class PlayState extends MusicBeatState gf.dance(); } - if (!boyfriend.animation.curAnim.name.startsWith("sing") && curBeat % idleBeat == 0) + if (!boyfriend.animation.curAnim.name.startsWith("sing") && (curBeat % idleBeat == 0 || !idleToBeat)) { boyfriend.playAnim('idle', idleToBeat); }