Skip to content
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

Bandaid fix for GF's crying animation #44

Merged
merged 1 commit into from
Jun 27, 2024
Merged

Bandaid fix for GF's crying animation #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions source/funkin/play/PlayState.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2673,6 +2673,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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,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
Loading