diff --git a/source/PlayState.hx b/source/PlayState.hx index 4f1237c..107576d 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -159,7 +159,10 @@ class PlayState extends MusicBeatState public static var misses:Int = 0; public static var campaignMisses:Int = 0; - + public static var campaignSicks:Int = 0; + public static var campaignGoods:Int = 0; + public static var campaignBads:Int = 0; + public static var campaignShits:Int = 0; public var accuracy:Float = 0.00; @@ -292,13 +295,11 @@ class PlayState extends MusicBeatState if (FlxG.sound.music != null) FlxG.sound.music.stop(); - if (!isStoryMode) - { - sicks = 0; - bads = 0; - shits = 0; - goods = 0; - } + sicks = 0; + bads = 0; + shits = 0; + goods = 0; + misses = 0; highestCombo = 0; @@ -3243,8 +3244,6 @@ class PlayState extends MusicBeatState PlayState.instance.remove(PlayState.instance.videoSprite); } - if (isStoryMode) - campaignMisses = misses; if (!loadRep) rep.SaveReplay(saveNotes, saveJudge, replayAna); @@ -3302,6 +3301,11 @@ class PlayState extends MusicBeatState if (isStoryMode) { campaignScore += Math.round(songScore); + campaignMisses += misses; + campaignSicks += sicks; + campaignGoods += goods; + campaignBads += bads; + campaignShits += shits; storyPlaylist.remove(storyPlaylist[0]); diff --git a/source/ResultsScreen.hx b/source/ResultsScreen.hx index 109af32..c066041 100644 --- a/source/ResultsScreen.hx +++ b/source/ResultsScreen.hx @@ -83,7 +83,12 @@ class ResultsScreen extends FlxSubState text.text = "Week Cleared!"; } - comboText = new FlxText(20,-75,0,'Judgements:\nSicks - ${PlayState.sicks}\nGoods - ${PlayState.goods}\nBads - ${PlayState.bads}\n\nCombo Breaks: ${(PlayState.isStoryMode ? PlayState.campaignMisses : PlayState.misses)}\nHighest Combo: ${PlayState.highestCombo + 1}\nScore: ${PlayState.instance.songScore}\nAccuracy: ${HelperFunctions.truncateFloat(PlayState.instance.accuracy,2)}%\n\n${Ratings.GenerateLetterRank(PlayState.instance.accuracy)}\n\n${!PlayState.loadRep ? "F1 - View replay\nF2 - Replay song" : ""} + var sicks = PlayState.isStoryMode ? PlayState.campaignSicks : PlayState.sicks; + var goods = PlayState.isStoryMode ? PlayState.campaignGoods : PlayState.goods; + var bads = PlayState.isStoryMode ? PlayState.campaignBads : PlayState.bads; + var shits = PlayState.isStoryMode ? PlayState.campaignShits : PlayState.shits; + + comboText = new FlxText(20,-75,0,'Judgements:\nSicks - ${PlayState.sicks}\nGoods - ${sicks}\nBads - ${bads}\n\nCombo Breaks: ${(PlayState.isStoryMode ? PlayState.campaignMisses : PlayState.misses)}\nHighest Combo: ${PlayState.highestCombo + 1}\nScore: ${PlayState.instance.songScore}\nAccuracy: ${HelperFunctions.truncateFloat(PlayState.instance.accuracy,2)}%\n\n${Ratings.GenerateLetterRank(PlayState.instance.accuracy)}\n\n${!PlayState.loadRep ? "F1 - View replay\nF2 - Replay song" : ""} '); comboText.size = 28; comboText.setBorderStyle(FlxTextBorderStyle.OUTLINE,FlxColor.BLACK,4,1);