diff --git a/source/Character.hx b/source/Character.hx index 1e520b8..542b8688 100644 --- a/source/Character.hx +++ b/source/Character.hx @@ -452,7 +452,7 @@ class Character extends FlxSprite /** * FOR GF DANCING SHIT */ - public function dance(forced:Bool = false) + public function dance(forced:Bool = false, altAnim:Bool = false) { if (!debugMode) { @@ -476,7 +476,10 @@ class Character extends FlxSprite else playAnim('danceLeft'); default: - playAnim('idle', forced); + if (altAnim && animation.getByName('idle-alt') != null) + playAnim('idle-alt', forced); + else + playAnim('idle', forced); } } } diff --git a/source/PlayState.hx b/source/PlayState.hx index 799f5e5..e81ab74 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -4594,7 +4594,7 @@ class PlayState extends MusicBeatState // Dad doesnt interupt his own notes if ((!dad.animation.curAnim.name.startsWith("sing")) && dad.curCharacter != 'gf') if ((curBeat % idleBeat == 0 || !idleToBeat) || dad.curCharacter == "spooky") - dad.dance(idleToBeat); + dad.dance(idleToBeat, SONG.notes[Math.floor(curStep / 16)].altAnim); } // FlxG.log.add('change bpm' + SONG.notes[Std.int(curStep / 16)].changeBPM); wiggleShit.update(Conductor.crochet);