Skip to content

add gfComboAnim to goodNoteHit #1115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
THEkatinamicrowave wants to merge 3 commits into
base: main
Choose a base branch
from
Open

add gfComboAnim to goodNoteHit #1115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65a2a02
add gfComboAnim to goodNoteHit
THEkatinamicrowave Sep 16, 2026
3af4510
not really a gf combo if *anyone* can do it, is it
THEkatinamicrowave Sep 16, 2026
fdcd764
add some examples (for some reason the other commit didn't go thru)
THEkatinamicrowave Sep 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions assets/data/characters/gf-car.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE codename-engine-character>
<character isPlayer="false" flipX="false" x="75" y="335" centercam="false" icon="gf" color="#A5004D">
<anim name="danceLeft" anim="GF Dancing Beat Hair blowing CAR" fps="24" loop="false" x="0" y="0" indices="0..15" />
<anim name="danceRight" anim="GF Dancing Beat Hair blowing CAR" fps="24" loop="false" x="0" y="0" indices="16..30" />
<anim name="danceLeft" anim="GF Dancing Beat Hair blowing CAR" indices="0..15" />
<anim name="danceRight" anim="GF Dancing Beat Hair blowing CAR" indices="16..30" />
</character>
9 changes: 5 additions & 4 deletions assets/data/characters/gf-christmas.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<!DOCTYPE codename-engine-character>
<character x="115" y="325" sprite="gf-christmas" icon="gf" centercam="false" color="#A5004D">
<anim name="danceLeft" anim="GF Dancing Beat" x="0" y="-9" fps="24" loop="false" indices="0..14"/>
<anim name="danceRight" anim="GF Dancing Beat" x="0" y="-9" fps="24" loop="false" indices="15..30"/>
<anim name="cheer" anim="GF Cheer" x="0" y="-9" fps="24" loop="false"/>
<anim name="sad" anim="gf sad" x="-51" y="306" fps="24" loop="true" indices="0..12"/>
<anim name="danceLeft" anim="GF Dancing Beat" y="-9" indices="0..14"/>
<anim name="danceRight" anim="GF Dancing Beat" y="-9" indices="15..30"/>
<anim name="cheer" anim="GF Cheer" y="-9"/>
<anim name="sad" anim="gf sad" x="-51" y="306" loop="true" indices="0..12"/>
<anim name="combo50" anim="GF Cheer" y="-9"/>
</character>
4 changes: 2 additions & 2 deletions assets/data/characters/gf-pixel.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE codename-engine-character>
<character x="180" y="300" sprite="gf-pixel" scale="6" antialiasing="false" camx="180" camy="300" icon="gf-pixel" color="#C70660">
<anim name="danceLeft" anim="GF IDLE" x="0" y="0" fps="24" loop="false" indices="0..14"/>
<anim name="danceRight" anim="GF IDLE" x="0" y="0" fps="24" loop="false" indices="15..30"/>
<anim name="danceLeft" anim="GF IDLE" indices="0..14"/>
<anim name="danceRight" anim="GF IDLE" indices="15..30"/>
</character>
6 changes: 3 additions & 3 deletions assets/data/characters/gf-tankmen.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE codename-engine-character>
<character sprite="gf-tankmen" icon="gf" centercam="false" color="#A5004D">
<anim name="danceLeft" anim="GF Dancing at Gunpoint" x="0" y="0" fps="24" loop="false" indices="0..14"/>
<anim name="danceRight" anim="GF Dancing at Gunpoint" x="0" y="0" fps="24" loop="false" indices="15..30"/>
<anim name="dance-cutscene" anim="GF Dancing at Gunpoint" x="0" y="0" fps="24" loop="true"/>
<anim name="danceLeft" anim="GF Dancing at Gunpoint" indices="0..14"/>
<anim name="danceRight" anim="GF Dancing at Gunpoint" indices="15..30"/>
<anim name="dance-cutscene" anim="GF Dancing at Gunpoint" loop="true"/>
<anim name="sad" anim="GF Crying at Gunpoint" x="-315" y="6" fps="24" loop="true" indices="0..12"/>
</character>
1 change: 1 addition & 0 deletions assets/data/characters/gf.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@
<anim name="hairFall" anim="GF Dancing Beat Hair Landing" indices="0..11"/>
<anim name="scared" anim="GF FEAR " loop="true"/>
<anim name="sad" anim="gf sad" x="-51" y="315" loop="true" indices="0..12"/>
<anim name="combo50" anim="GF Cheer"/>
</character>
4 changes: 4 additions & 0 deletions source/funkin/backend/scripting/events/note/NoteHitEvent.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Bool>;
/**
* Whenever anybody with a combo anim for your combo ought to play it (think GF's "combo50" anim).
*/
public var charsComboAnim:Null<Bool>;
/**
* Note that has been pressed
*/
Expand Down
8 changes: 8 additions & 0 deletions source/funkin/game/PlayState.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down