AirDog46/Kade-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix story mode desyncing ranking with combos

Browse Source
This commit is contained in:
KadeDeveloper 2021-08-06 15:24:15 -07:00
parent fa77122877
commit a9365239f0
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/PlayState.hx
View File

@ -159,7 +159,10 @@ class PlayState extends MusicBeatState
public static var misses:Int = 0; public static var misses:Int = 0;
public static var campaignMisses: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; public var accuracy:Float = 0.00;
@ -292,13 +295,11 @@ class PlayState extends MusicBeatState
if (FlxG.sound.music != null) if (FlxG.sound.music != null)
FlxG.sound.music.stop(); FlxG.sound.music.stop();
if (!isStoryMode)
{
sicks = 0; sicks = 0;
bads = 0; bads = 0;
shits = 0; shits = 0;
goods = 0; goods = 0;
}
misses = 0; misses = 0;
highestCombo = 0; highestCombo = 0;
@ -3243,8 +3244,6 @@ class PlayState extends MusicBeatState
PlayState.instance.remove(PlayState.instance.videoSprite); PlayState.instance.remove(PlayState.instance.videoSprite);
} }
if (isStoryMode)
campaignMisses = misses;
if (!loadRep) if (!loadRep)
rep.SaveReplay(saveNotes, saveJudge, replayAna); rep.SaveReplay(saveNotes, saveJudge, replayAna);
@ -3302,6 +3301,11 @@ class PlayState extends MusicBeatState
if (isStoryMode) if (isStoryMode)
{ {
campaignScore += Math.round(songScore); campaignScore += Math.round(songScore);
campaignMisses += misses;
campaignSicks += sicks;
campaignGoods += goods;
campaignBads += bads;
campaignShits += shits;
storyPlaylist.remove(storyPlaylist[0]); storyPlaylist.remove(storyPlaylist[0]);

7
source/ResultsScreen.hx
View File

@ -83,7 +83,12 @@ class ResultsScreen extends FlxSubState
text.text = "Week Cleared!"; 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.size = 28;
comboText.setBorderStyle(FlxTextBorderStyle.OUTLINE,FlxColor.BLACK,4,1); comboText.setBorderStyle(FlxTextBorderStyle.OUTLINE,FlxColor.BLACK,4,1);