Skip to content

Commit

Permalink
Bandaid fix for GF's crying animation
Browse files Browse the repository at this point in the history
Plays drop70 when combo of 70 or more is broken.
Adds comments for proper implementation.
  • Loading branch information
Hundrec authored and charlesisfeline committed Jul 16, 2024
1 parent 4df5538 commit 9f2d679
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
5 changes: 5 additions & 0 deletions source/funkin/play/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -2669,6 +2669,11 @@ class PlayState extends MusicBeatSubState
health += healthChange;
if (isComboBreak)
{
// BANDAID FIX: Play GF's crying animation if combo of 70 or more is broken.
// TODO: Handle this in play.character.BaseCharacter instead!
if (Highscore.tallies.combo >= 70)
currentStage.getGirlfriend().playAnimation('drop70', true);

// Break the combo, but don't increment tallies.misses.
if (Highscore.tallies.combo >= 10) comboPopUps.displayCombo(0);
Highscore.tallies.combo = 0;
Expand Down
6 changes: 6 additions & 0 deletions source/funkin/play/character/BaseCharacter.hx
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,12 @@ class BaseCharacter extends Bopper
// If the note is from the same strumline, play the sing animation.
this.playSingAnimation(event.note.noteData.getDirection(), true);
}

/**
* This GF animation code only runs when the player lets a note fly off the screen.
* Run this for all combo breaks instead (bad/shit).
* Maybe add a new public function called onComboBreak in play.stage.Bopper?
*/
else if (event.note.noteData.getMustHitNote() && characterType == GF)
{
var dropAnim = '';
Expand Down

0 comments on commit 9f2d679

Please sign in to comment.