diff --git a/source/Character.hx b/source/Character.hx index 36c493c5a..b078778e6 100644 --- a/source/Character.hx +++ b/source/Character.hx @@ -281,14 +281,14 @@ class Character extends FlxSprite animation.addByPrefix('singRIGHT-alt', 'Parent Right Note Mom', 24, false); addOffset('idle'); - addOffset("singUP", -20, 50); - addOffset("singRIGHT", -51); - addOffset("singLEFT", -30); - addOffset("singDOWN", -30, -40); - addOffset("singUP-alt", -20, 50); - addOffset("singRIGHT-alt", -51); - addOffset("singLEFT-alt", -30); - addOffset("singDOWN-alt", -30, -40); + addOffset("singUP", -47, 24); + addOffset("singRIGHT", -1, -23); + addOffset("singLEFT", -30, 16); + addOffset("singDOWN", -31, -29); + addOffset("singUP-alt", -47, 24); + addOffset("singRIGHT-alt", -1, -24); + addOffset("singLEFT-alt", -30, 15); + addOffset("singDOWN-alt", -30, -27); case 'monster-christmas': frames = FlxAtlasFrames.fromSparrow('assets/images/christmas/Monster_Assets_Christmas.png', 'assets/images/christmas/Monster_Assets_Christmas.xml'); @@ -369,51 +369,56 @@ class Character extends FlxSprite */ public function dance() { - switch (curCharacter) + if (!debugMode) { - case 'mom': - playAnim('idle'); - case 'mom-car': - playAnim('idle'); - case 'bf': - playAnim('idle'); - case 'bf-car': - playAnim('idle'); - case 'gf': - if (!animation.curAnim.name.startsWith('hair')) - { + switch (curCharacter) + { + case 'mom': + playAnim('idle'); + case 'mom-car': + playAnim('idle'); + case 'bf': + playAnim('idle'); + case 'bf-car': + playAnim('idle'); + case 'gf': + if (!animation.curAnim.name.startsWith('hair')) + { + danced = !danced; + + if (danced) + playAnim('danceRight'); + else + playAnim('danceLeft'); + } + + case 'gf-car': + if (!animation.curAnim.name.startsWith('hair')) + { + danced = !danced; + + if (danced) + playAnim('danceRight'); + else + playAnim('danceLeft'); + } + + case 'spooky': danced = !danced; if (danced) playAnim('danceRight'); else playAnim('danceLeft'); - } - - case 'gf-car': - if (!animation.curAnim.name.startsWith('hair')) - { - danced = !danced; - - if (danced) - playAnim('danceRight'); - else - playAnim('danceLeft'); - } - - case 'spooky': - danced = !danced; - - if (danced) - playAnim('danceRight'); - else - playAnim('danceLeft'); - case 'dad': - playAnim('idle'); - case 'monster': - playAnim('idle'); - case 'pico': - playAnim('idle'); + case 'dad': + playAnim('idle'); + case 'parents-christmas': + playAnim('idle'); + case 'monster': + playAnim('idle'); + case 'pico': + playAnim('idle'); + } } } diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index f982cc735..95dcd494b 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -66,6 +66,13 @@ class FreeplayState extends MusicBeatState songs.push('Milf'); } + if (StoryMenuState.weekUnlocked[5] || isDebug) + { + songs.push('Cocoa'); + songs.push('Eggnog'); + // songs.push('Milf'); + } + // LOAD MUSIC // LOAD CHARACTERS diff --git a/source/PlayState.hx b/source/PlayState.hx index 537f0bd19..c5551f0d0 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -987,16 +987,26 @@ class PlayState extends MusicBeatState if (SONG.song != 'Tutorial') camZooming = true; + var altAnim:String = ""; + + if (SONG.notes[Math.floor(curStep / 16)] != null) + { + if (SONG.notes[Math.floor(curStep / 16)].altAnim) + altAnim = '-alt'; + } + + trace("DA ALT THO?: " + SONG.notes[Math.floor(curStep / 16)].altAnim); + switch (Math.abs(daNote.noteData)) { case 2: - dad.playAnim('singUP', true); + dad.playAnim('singUP' + altAnim, true); case 3: - dad.playAnim('singRIGHT', true); + dad.playAnim('singRIGHT' + altAnim, true); case 1: - dad.playAnim('singDOWN', true); + dad.playAnim('singDOWN' + altAnim, true); case 0: - dad.playAnim('singLEFT', true); + dad.playAnim('singLEFT' + altAnim, true); } dad.holdTimer = 0;