some animation touchups

This commit is contained in:
Cameron Taylor
2020-11-10 19:09:48 -08:00
parent 0a4273bd1a
commit 79ccb61cfb
6 changed files with 54 additions and 3 deletions

View File

@ -783,6 +783,8 @@ class PlayState extends MusicBeatState
dad.playAnim('singLEFT', true);
}
dad.holdTimer = 0;
if (SONG.needsVoices)
vocals.volume = 1;
@ -1012,6 +1014,8 @@ class PlayState extends MusicBeatState
// FlxG.watch.addQuick('asdfa', upP);
if ((upP || rightP || downP || leftP) && !boyfriend.stunned && generatedMusic)
{
boyfriend.holdTimer = 0;
var possibleNotes:Array<Note> = [];
notes.forEachAlive(function(daNote:Note)
@ -1082,9 +1086,9 @@ class PlayState extends MusicBeatState
});
}
if (upR || leftR || rightR || downR)
if (boyfriend.holdTimer > Conductor.stepCrochet * 4 * 0.001 && !up && !down && !right && !left)
{
if (boyfriend.animation.curAnim.name.startsWith('sing'))
if (boyfriend.animation.curAnim.name.startsWith('sing') && !boyfriend.animation.curAnim.name.endsWith('miss'))
{
boyfriend.playAnim('idle');
}