Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-27 01:55:52 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix a bug where 000 would display any time a Bad or Shit is hit (instead of just when a combo break is hit)

Browse source
This commit is contained in:
EliteMasterEric 2024-03-28 00:19:57 -04:00
parent c1c2621e1d
commit 837fcee983
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/funkin/play/PlayState.hx
View file

@ -2441,7 +2441,8 @@ class PlayState extends MusicBeatSubState
if (Highscore.tallies.combo != 0) if (Highscore.tallies.combo != 0)
{ {
// Break the combo. // Break the combo.
Highscore.tallies.combo = comboPopUps.displayCombo(0); if (Highscore.tallies.combo >= 10) comboPopUps.displayCombo(0);
Highscore.tallies.combo = 0;
} }
if (playSound) if (playSound)
@ -2607,18 +2608,18 @@ class PlayState extends MusicBeatSubState
if (isComboBreak) if (isComboBreak)
{ {
// Break the combo, but don't increment tallies.misses. // Break the combo, but don't increment tallies.misses.
Highscore.tallies.combo = comboPopUps.displayCombo(0); if (Highscore.tallies.combo >= 10) comboPopUps.displayCombo(0);
Highscore.tallies.combo = 0;
} }
else else
{ {
Highscore.tallies.combo++; Highscore.tallies.combo++;
Highscore.tallies.totalNotesHit++;
if (Highscore.tallies.combo > Highscore.tallies.maxCombo) Highscore.tallies.maxCombo = Highscore.tallies.combo; if (Highscore.tallies.combo > Highscore.tallies.maxCombo) Highscore.tallies.maxCombo = Highscore.tallies.combo;
} }
playerStrumline.hitNote(daNote, !isComboBreak); playerStrumline.hitNote(daNote, !isComboBreak);
if (daRating == "sick") if (daRating == 'sick')
{ {
playerStrumline.playNoteSplash(daNote.noteData.getDirection()); playerStrumline.playNoteSplash(daNote.noteData.getDirection());
} }