ApfelTeeSaft/FunkinMP
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/FunkinMP.git synced 2026-08-26 19:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix duplicate combo counter on combo break

Browse Source 
Co-authored-by: Eric <[email protected]>
Co-authored-by: Hundrec <[email protected]>
This commit is contained in:
EliteMasterEric
2024-10-04 07:59:58 -04:00
co-authored by Hundrec
parent a561bd2e00
commit 295348de5d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/play/PlayState.hx
+4 -4
View File
@@ -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;
}