gabry/Funkin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: miss-animation timing in no-anim events

Browse Source
This commit is contained in:
AnimatingLegend
2026-03-13 21:25:52 -06:00
committed by Hundrec
parent 89029220e4
commit aabd1aa9f7
1 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/play/character/BaseCharacter.hx
+14 -27
View File
@@ -371,7 +371,11 @@ class BaseCharacter extends Bopper
// Reset hold timer for each note pressed.
if (justPressedNote() && this.characterType == BF)
{
holdTimer = 0;
// If the note kind has `noanim` do not reset holdTimer.
if (curNoteKind != null && !curNoteKind.noanim)
{
holdTimer = 0;
}
}
if (isDead)
@@ -530,39 +534,21 @@ class BaseCharacter extends Bopper
super.onNoteHit(event);
// If another script cancelled the event, don't do anything.
if (event.eventCanceled) return;
curNoteKind = NoteKindManager.getNoteKind(event.note.noteData.kind);
// Let the character naturally transition back to their idle/dance animation.
if (curNoteKind != null && curNoteKind.noanim) return;
if (event.note.noteData.getMustHitNote() && characterType == BF)
{
if (curNoteKind != null)
{
if (!curNoteKind.noanim)
{
this.playSingAnimation(event.note.noteData.getDirection(), false, curNoteKind?.suffix);
holdTimer = 0;
}
}
else
{
this.playSingAnimation(event.note.noteData.getDirection(), false);
holdTimer = 0;
}
this.playSingAnimation(event.note.noteData.getDirection(), false);
holdTimer = 0;
}
else if (!event.note.noteData.getMustHitNote() && characterType == DAD)
{
if (curNoteKind != null)
{
if (!curNoteKind.noanim)
{
this.playSingAnimation(event.note.noteData.getDirection(), false, curNoteKind?.suffix);
holdTimer = 0;
}
}
else
{
this.playSingAnimation(event.note.noteData.getDirection(), false);
holdTimer = 0;
}
this.playSingAnimation(event.note.noteData.getDirection(), false);
holdTimer = 0;
}
else if (characterType == GF && event.note.noteData.getMustHitNote())
{
@@ -591,6 +577,7 @@ class BaseCharacter extends Bopper
{
// If the note is from the same strumline, play the miss animation.
this.playSingAnimation(event.note.noteData.getDirection(), true);
this.holdTimer = 0;
}
else if (!event.note.noteData.getMustHitNote() && characterType == DAD)
{