From 295348de5d2e80d10374a2f02a681715bb9382b4 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx index c2d11e95..9069d633 100644 --- a/source/funkin/play/PlayState.hx +++ b/source/funkin/play/PlayState.hx @@ -1457,6 +1457,8 @@ class PlayState extends MusicBeatSubState if (FlxG.sound.music != null) { var correctSync:Float = Math.min(FlxG.sound.music.length, Math.max(0, Conductor.instance.songPosition - Conductor.instance.combinedOffset)); + var playerVoicesError:Float = 0; + var opponentVoicesError:Float = 0; var playerVoicesError:Float = 0; var opponentVoicesError:Float = 0; @@ -2563,8 +2565,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. @@ -2634,8 +2636,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) @@ -2854,7 +2854,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; }