From dcb565309ea428f81eab952b5c94e4c9d9026910 Mon Sep 17 00:00:00 2001 From: JordanSantiagoYT Date: Sun, 10 Nov 2024 12:43:35 -0500 Subject: [PATCH] idk --- source/PlayState.hx | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index 52f9cd7b37d..3ea45a37d3e 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -358,10 +358,6 @@ class PlayState extends MusicBeatState public var songHits:Int = 0; public var songMisses:Float = 0; public var scoreTxt:FlxText; - var comboTxt:FlxText; - var missTxt:FlxText; - var accuracyTxt:FlxText; - var npsTxt:FlxText; var timeTxt:FlxText; var hitTxt:FlxText; @@ -2489,6 +2485,9 @@ class PlayState extends MusicBeatState } } + var comboInfo = ClientPrefs.showComboInfo; + var showNPS = ClientPrefs.showNPS; + var missString:String = ''; public function updateScore(miss:Bool = false) { scoreTxtUpdateFrame++; @@ -2506,37 +2505,41 @@ class PlayState extends MusicBeatState formattedCombo = formatNumber(combo); formattedNPS = formatNumber(nps); formattedMaxNPS = formatNumber(maxNPS); - npsString = ClientPrefs.showNPS ? ' $divider ' + (cpuControlled && ClientPrefs.botWatermark ? 'Bot ' : '') + 'NPS/Max: ' + formattedNPS + '/' + formattedMaxNPS : ''; + npsString = showNPS ? ' $divider ' + (cpuControlled && ClientPrefs.botWatermark ? 'Bot ' : '') + 'NPS/Max: ' + formattedNPS + '/' + formattedMaxNPS : ''; accuracy = Highscore.floorDecimal(ratingPercent * 100, 2) + '%'; fcString = ratingFC; + missString = (!instakillOnMiss ? switch(ClientPrefs.scoreStyle) + { + case 'Kade Engine', 'VS Impostor': ' $divider Combo Breaks: ' + formattedSongMisses; + case 'Doki Doki+': ' $divider Breaks: ' + formattedSongMisses; + default: + ' $divider Misses: ' + formattedSongMisses; + } : ''); botText = cpuControlled && ClientPrefs.botWatermark ? ' $divider Botplay Mode' : ''; if (cpuControlled && ClientPrefs.botWatermark) - tempScore = 'Bot Score: ' + formattedScore + (ClientPrefs.showComboInfo ? ' $divider Bot Combo: ' + formattedCombo : '') + npsString + botText; + tempScore = 'Bot Score: ' + formattedScore + (comboInfo ? ' $divider Bot Combo: ' + formattedCombo : '') + npsString + botText; else switch (ClientPrefs.scoreStyle) { - case 'Kade Engine': - tempScore = 'Score: ' + formattedScore + ' $divider Combo Breaks: ' + formattedSongMisses + (ClientPrefs.showComboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Accuracy: ' + accuracy + ' $divider (' + fcString + ') ' + ratingName; - - case "Doki Doki+": - tempScore = 'Score: ' + formattedScore + ' $divider Breaks: ' + formattedSongMisses + (ClientPrefs.showComboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Accuracy: ' + accuracy + ' $divider (' + fcString + ') ' + ratingName; + case 'Kade Engine', 'Doki Doki+': + tempScore = 'Score: ' + formattedScore + missString + (comboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Accuracy: ' + accuracy + ' $divider (' + fcString + ') ' + ratingName; case "Dave Engine": - tempScore = 'Score: ' + formattedScore + ' $divider Misses: ' + formattedSongMisses + (ClientPrefs.showComboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Accuracy: ' + accuracy + ' $divider ' + fcString; + tempScore = 'Score: ' + formattedScore + missString + (comboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Accuracy: ' + accuracy + ' $divider ' + fcString; case "Forever Engine": - tempScore = 'Score: ' + formattedScore + ' $divider Accuracy: ' + Highscore.floorDecimal(ratingPercent * 100, 2) + '% [' + fcString + ']' + ' $divider Combo Breaks: ' + formattedSongMisses + (ClientPrefs.showComboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Rank: ' + ratingName; + tempScore = 'Score: ' + formattedScore + ' $divider Accuracy: $accuracy [' + fcString + ']' + missString + (comboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Rank: ' + ratingName; case "Psych Engine", "JS Engine", "TGT V4": - tempScore = 'Score: ' + formattedScore + ' $divider Misses: ' + formattedSongMisses + (ClientPrefs.showComboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Rating: ' + ratingName + (ratingName != '?' ? ' (${accuracy}) - $fcString' : ''); + tempScore = 'Score: ' + formattedScore + missString + (comboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Rating: ' + ratingName + (ratingName != '?' ? ' (${accuracy}) - $fcString' : ''); case "Leather Engine": - tempScore = '< Score: ' + formattedScore + ' $divider Misses: ' + formattedSongMisses + (ClientPrefs.showComboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Rating: ' + ratingName + (ratingName != '?' ? ' (${accuracy}) - $fcString' : ''); + tempScore = '< Score: ' + formattedScore + missString + (comboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Rating: ' + ratingName + (ratingName != '?' ? ' (${accuracy}) - $fcString' : ''); case 'VS Impostor': - tempScore = 'Score: ' + formattedScore + ' $divider Combo Breaks: ' + formattedSongMisses + (ClientPrefs.showComboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Accuracy: ' + Highscore.floorDecimal(ratingPercent * 100, 2) + '% [' + fcString + ']'; + tempScore = 'Score: ' + formattedScore + missString + (comboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Accuracy: $accuracy [' + fcString + ']'; case 'Vanilla': tempScore = 'Score: ' + formattedScore; @@ -6436,6 +6439,8 @@ class PlayState extends MusicBeatState if (SONG.notes[curSection].changeBPM) { Conductor.changeBPM(SONG.notes[curSection].bpm); + SustainSplash.startCrochet = Conductor.stepCrochet; + SustainSplash.frameRate = Math.floor(24 / 100 * Conductor.bpm); setOnLuas('curBpm', Conductor.bpm); setOnLuas('crochet', Conductor.crochet); setOnLuas('stepCrochet', Conductor.stepCrochet);