mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2025-03-21 09:29:41 +00:00
Fix duplicate combo counter on combo break
Co-authored-by: Eric <ericmyllyoja@gmail.com> Co-authored-by: Hundrec <hundrecard@gmail.com>
This commit is contained in:
parent
f1b6e6c4e4
commit
a4ed55721f
|
@ -2562,8 +2562,8 @@ class PlayState extends MusicBeatSubState
|
|||
healthChange = Constants.HEALTH_BAD_BONUS;
|
||||
isComboBreak = Constants.JUDGEMENT_BAD_COMBO_BREAK;
|
||||
case 'shit':
|
||||
isComboBreak = Constants.JUDGEMENT_SHIT_COMBO_BREAK;
|
||||
healthChange = Constants.HEALTH_SHIT_BONUS;
|
||||
isComboBreak = Constants.JUDGEMENT_SHIT_COMBO_BREAK;
|
||||
}
|
||||
|
||||
// Send the note hit event.
|
||||
|
@ -2633,8 +2633,6 @@ class PlayState extends MusicBeatSubState
|
|||
}
|
||||
vocals.playerVolume = 0;
|
||||
|
||||
if (Highscore.tallies.combo != 0) if (Highscore.tallies.combo >= 10) comboPopUps.displayCombo(0);
|
||||
|
||||
applyScore(-10, 'miss', healthChange, true);
|
||||
|
||||
if (playSound)
|
||||
|
@ -2853,7 +2851,7 @@ class PlayState extends MusicBeatSubState
|
|||
}
|
||||
}
|
||||
comboPopUps.displayRating(daRating);
|
||||
if (combo >= 10 || combo == 0) comboPopUps.displayCombo(combo);
|
||||
if (combo >= 10) comboPopUps.displayCombo(combo);
|
||||
|
||||
vocals.playerVolume = 1;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue