From 0833778a5484721ff5f59d79c355ac8ff6dc2104 Mon Sep 17 00:00:00 2001 From: Spel0 <75626813+Spel0@users.noreply.github.com> Date: Sun, 8 Aug 2021 19:19:40 +0300 Subject: [PATCH 1/5] senpai fix --- source/PlayState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index 17fd3ac..acd7aeb 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -4537,7 +4537,7 @@ class PlayState extends MusicBeatState // Conductor.changeBPM(SONG.bpm); // Dad doesnt interupt his own notes - if ((SONG.notes[Math.floor(curStep / 16)].mustHitSection || !dad.animation.curAnim.name.startsWith("sing")) && dad.curCharacter != 'gf') + if ((!dad.animation.curAnim.name.startsWith("sing")) && dad.curCharacter != 'gf') if ((curBeat % idleBeat == 0 || !idleToBeat) || dad.curCharacter == "spooky") dad.dance(idleToBeat); } From 42269e048b2b23c47cf7c595c6ba01b5534ca6e9 Mon Sep 17 00:00:00 2001 From: Spel0 <75626813+Spel0@users.noreply.github.com> Date: Sun, 8 Aug 2021 19:27:27 +0300 Subject: [PATCH 2/5] fix for bf sprites with less than 10 frames of note animation --- source/PlayState.hx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index acd7aeb..26bb9d2 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -3901,7 +3901,7 @@ class PlayState extends MusicBeatState if (boyfriend.holdTimer > Conductor.stepCrochet * 4 * 0.001 && (!holdArray.contains(true) || PlayStateChangeables.botPlay)) { - if (boyfriend.animation.curAnim.name.startsWith('sing') && !boyfriend.animation.curAnim.name.endsWith('miss') && boyfriend.animation.curAnim.curFrame >= 10) + if (boyfriend.animation.curAnim.name.startsWith('sing') && !boyfriend.animation.curAnim.name.endsWith('miss') && (boyfriend.animation.curAnim.curFrame >= 10 || boyfriend.animation.curAnim.finished)) boyfriend.playAnim('idle'); } else if (!FlxG.save.data.ghost) @@ -3964,7 +3964,7 @@ class PlayState extends MusicBeatState if (boyfriend.holdTimer > Conductor.stepCrochet * 4 * 0.001 && (!holdArray.contains(true) || PlayStateChangeables.botPlay)) { - if (boyfriend.animation.curAnim.name.startsWith('sing') && !boyfriend.animation.curAnim.name.endsWith('miss') && boyfriend.animation.curAnim.curFrame >= 10) + if (boyfriend.animation.curAnim.name.startsWith('sing') && !boyfriend.animation.curAnim.name.endsWith('miss') && (boyfriend.animation.curAnim.curFrame >= 10 || boyfriend.animation.curAnim.finished)) boyfriend.playAnim('idle'); } From 3a748bde199d1bbb3bfd5e951342d29540a8556b Mon Sep 17 00:00:00 2001 From: Spel0 <75626813+Spel0@users.noreply.github.com> Date: Tue, 10 Aug 2021 19:04:38 +0300 Subject: [PATCH 3/5] arrows anim fix --- source/PlayState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index 26bb9d2..fa9cc3f 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -3972,7 +3972,7 @@ class PlayState extends MusicBeatState { playerStrums.forEach(function(spr:FlxSprite) { - if (keys[spr.ID] && spr.animation.curAnim.name != 'confirm') + if (keys[spr.ID] && spr.animation.curAnim.name != 'confirm' && spr.animation.curAnim.name != 'pressed') spr.animation.play('pressed', false); if (!keys[spr.ID]) spr.animation.play('static', false); From 83ef9954ffb15a3b4129da893672115f38738c55 Mon Sep 17 00:00:00 2001 From: Spel0 <75626813+Spel0@users.noreply.github.com> Date: Tue, 10 Aug 2021 19:39:44 +0300 Subject: [PATCH 4/5] Revert "arrows anim fix" This reverts commit 3a748bde199d1bbb3bfd5e951342d29540a8556b. --- source/PlayState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index fa9cc3f..26bb9d2 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -3972,7 +3972,7 @@ class PlayState extends MusicBeatState { playerStrums.forEach(function(spr:FlxSprite) { - if (keys[spr.ID] && spr.animation.curAnim.name != 'confirm' && spr.animation.curAnim.name != 'pressed') + if (keys[spr.ID] && spr.animation.curAnim.name != 'confirm') spr.animation.play('pressed', false); if (!keys[spr.ID]) spr.animation.play('static', false); From 418f9d2f1953507c205df0efdb455e4ee588db9b Mon Sep 17 00:00:00 2001 From: Spel0 <75626813+Spel0@users.noreply.github.com> Date: Tue, 10 Aug 2021 19:40:04 +0300 Subject: [PATCH 5/5] Revert "Revert "arrows anim fix"" This reverts commit 83ef9954ffb15a3b4129da893672115f38738c55. --- source/PlayState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index 26bb9d2..fa9cc3f 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -3972,7 +3972,7 @@ class PlayState extends MusicBeatState { playerStrums.forEach(function(spr:FlxSprite) { - if (keys[spr.ID] && spr.animation.curAnim.name != 'confirm') + if (keys[spr.ID] && spr.animation.curAnim.name != 'confirm' && spr.animation.curAnim.name != 'pressed') spr.animation.play('pressed', false); if (!keys[spr.ID]) spr.animation.play('static', false);