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 @@ + diff --git a/source/funkin/backend/scripting/events/note/NoteHitEvent.hx b/source/funkin/backend/scripting/events/note/NoteHitEvent.hx index 8dd7b49022..e99f9628bd 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 charsComboAnim:Null; /** * Note that has been pressed */ diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 70fedc8ec1..06ad08ff46 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.charsComboAnim && 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);