From 65a2a02aa74058c1833440fa0e90fd7dd41b0385 Mon Sep 17 00:00:00 2001 From: Microkat <89645987+THEkatinamicrowave@users.noreply.github.com> Date: Wed, 16 Sep 2026 18:29:22 -0400 Subject: [PATCH 1/3] add gfComboAnim to goodNoteHit --- .../funkin/backend/scripting/events/note/NoteHitEvent.hx | 4 ++++ source/funkin/game/PlayState.hx | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/source/funkin/backend/scripting/events/note/NoteHitEvent.hx b/source/funkin/backend/scripting/events/note/NoteHitEvent.hx index 8dd7b49022..0f549eaa4e 100644 --- a/source/funkin/backend/scripting/events/note/NoteHitEvent.hx +++ b/source/funkin/backend/scripting/events/note/NoteHitEvent.hx @@ -39,6 +39,10 @@ final class NoteHitEvent extends CancellableEvent { * Whenever the Combo sprite should be shown or not (like old Week 7 patches). */ public var displayCombo:Null; + /** + * Whenever anybody with a combo anim for your combo ought to play it (think GF's "combo50" anim). + */ + public var gfComboAnim:Null; /** * Note that has been pressed */ diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 70fedc8ec1..97080acbd0 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -2024,6 +2024,14 @@ class PlayState extends MusicBeatState } else if (event.countAsCombo) combo++; + if (event.gfComboAnim && event.player && combo > 0) { + var comboAnim:String = 'combo$combo'; + + for (sl in strumLines.members) for (c in sl.characters) { + if (c.hasAnim(comboAnim)) c.playAnim(comboAnim, true); + } + } + if (event.showRating || (event.showRating == null && event.player)) { displayCombo(event); From 3af4510f279ecaa7bbef2ffaeaf4524c761c01bc Mon Sep 17 00:00:00 2001 From: Microkat <89645987+THEkatinamicrowave@users.noreply.github.com> Date: Wed, 16 Sep 2026 18:32:47 -0400 Subject: [PATCH 2/3] not really a gf combo if *anyone* can do it, is it --- source/funkin/backend/scripting/events/note/NoteHitEvent.hx | 2 +- source/funkin/game/PlayState.hx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/funkin/backend/scripting/events/note/NoteHitEvent.hx b/source/funkin/backend/scripting/events/note/NoteHitEvent.hx index 0f549eaa4e..e99f9628bd 100644 --- a/source/funkin/backend/scripting/events/note/NoteHitEvent.hx +++ b/source/funkin/backend/scripting/events/note/NoteHitEvent.hx @@ -42,7 +42,7 @@ final class NoteHitEvent extends CancellableEvent { /** * Whenever anybody with a combo anim for your combo ought to play it (think GF's "combo50" anim). */ - public var gfComboAnim:Null; + public var charsComboAnim:Null; /** * Note that has been pressed */ diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 97080acbd0..06ad08ff46 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -2024,7 +2024,7 @@ class PlayState extends MusicBeatState } else if (event.countAsCombo) combo++; - if (event.gfComboAnim && event.player && combo > 0) { + if (event.charsComboAnim && event.player && combo > 0) { var comboAnim:String = 'combo$combo'; for (sl in strumLines.members) for (c in sl.characters) { From fdcd7647d072fe07c6d8b5ec23868acd6022570a Mon Sep 17 00:00:00 2001 From: Microkat <89645987+THEkatinamicrowave@users.noreply.github.com> Date: Wed, 16 Sep 2026 18:42:21 -0400 Subject: [PATCH 3/3] add some examples (for some reason the other commit didn't go thru) --- assets/data/characters/gf-car.xml | 4 ++-- assets/data/characters/gf-christmas.xml | 9 +++++---- assets/data/characters/gf-pixel.xml | 4 ++-- assets/data/characters/gf-tankmen.xml | 6 +++--- assets/data/characters/gf.xml | 1 + 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/assets/data/characters/gf-car.xml b/assets/data/characters/gf-car.xml index d67a9beede..a99e6abdd2 100644 --- a/assets/data/characters/gf-car.xml +++ b/assets/data/characters/gf-car.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/assets/data/characters/gf-christmas.xml b/assets/data/characters/gf-christmas.xml index 19c7624f34..7b6ff251e8 100644 --- a/assets/data/characters/gf-christmas.xml +++ b/assets/data/characters/gf-christmas.xml @@ -1,7 +1,8 @@ - - - - + + + + + diff --git a/assets/data/characters/gf-pixel.xml b/assets/data/characters/gf-pixel.xml index eefc4cba56..5331fb5c5d 100644 --- a/assets/data/characters/gf-pixel.xml +++ b/assets/data/characters/gf-pixel.xml @@ -1,5 +1,5 @@ - - + + diff --git a/assets/data/characters/gf-tankmen.xml b/assets/data/characters/gf-tankmen.xml index 5d5bc2e823..e726db24d3 100644 --- a/assets/data/characters/gf-tankmen.xml +++ b/assets/data/characters/gf-tankmen.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/assets/data/characters/gf.xml b/assets/data/characters/gf.xml index 52bc78fc7a..4428c097e5 100644 --- a/assets/data/characters/gf.xml +++ b/assets/data/characters/gf.xml @@ -11,4 +11,5 @@ +