From a4ed55721ffc7fdf7675e2acdb3cb564fc08d6ad Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Fri, 4 Oct 2024 07:58:21 -0400 Subject: [PATCH] Fix duplicate combo counter on combo break Co-authored-by: Eric Co-authored-by: Hundrec --- source/funkin/play/PlayState.hx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx index d28ae6535..dbacf3fa9 100644 --- a/source/funkin/play/PlayState.hx +++ b/source/funkin/play/PlayState.hx @@ -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; }