diff --git a/source/meta/state/PlayState.hx b/source/meta/state/PlayState.hx index 654a00b2..f33d0b43 100644 --- a/source/meta/state/PlayState.hx +++ b/source/meta/state/PlayState.hx @@ -4756,9 +4756,11 @@ class PlayState extends MusicBeatState CustomFadeTransition.nextCamera = null; } - persistentUpdate = true; - openSubState(new ResultsSubState(sicks, goods, bads, shits, Std.int(campaignScore), Std.int(campaignMisses), - Highscore.floorDecimal(ratingPercent * 100, 2), ratingName, ratingFC)); + new FlxTimer().start(1, function(tmr:FlxTimer) { + persistentUpdate = true; + openSubState(new ResultsSubState(sicks, goods, bads, shits, Std.int(campaignScore), Std.int(campaignMisses), + Highscore.floorDecimal(ratingPercent * 100, 2), ratingName, ratingFC)); + }); if(!ClientPrefs.getGameplaySetting('practice', false) && !ClientPrefs.getGameplaySetting('botplay', false)) { StoryMenuState.weekCompleted.set(WeekData.weeksList[storyWeek], true); @@ -4818,9 +4820,11 @@ class PlayState extends MusicBeatState CustomFadeTransition.nextCamera = null; } - persistentUpdate = true; - openSubState(new ResultsSubState(sicks, goods, bads, shits, songScore, songMisses, - Highscore.floorDecimal(ratingPercent * 100, 2), ratingName, ratingFC)); + new FlxTimer().start(1, function(tmr:FlxTimer) { + persistentUpdate = true; + openSubState(new ResultsSubState(sicks, goods, bads, shits, songScore, songMisses, + Highscore.floorDecimal(ratingPercent * 100, 2), ratingName, ratingFC)); + }); changedDifficulty = false; } diff --git a/source/meta/substate/ResultsSubState.hx b/source/meta/substate/ResultsSubState.hx index d55a6891..4b98bf6e 100644 --- a/source/meta/substate/ResultsSubState.hx +++ b/source/meta/substate/ResultsSubState.hx @@ -3,11 +3,14 @@ package meta.substate; import flixel.FlxG; import flixel.FlxSprite; import flixel.text.FlxText; +import flixel.tweens.FlxTween; +import flixel.tweens.FlxEase; + import flixel.util.FlxColor; +import flixel.util.FlxTimer; import meta.*; import meta.state.*; - import meta.state.PlayState; // ? <-- looks like the glottal stop!! @@ -49,12 +52,12 @@ class ResultsSubState extends MusicBeatSubstate bg = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, FlxColor.BLACK); bg.scale.set(10, 10); - bg.alpha = 0.5; + bg.alpha = 0; add(bg); var versionShit:FlxText = new FlxText(12, FlxG.height - 24, 0, 'Press ACCEPT to continue.', 12); versionShit.scrollFactor.set(); - versionShit.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + versionShit.setFormat("VCR OSD Mono", 26, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); add(versionShit); titleTxt = new FlxText(0, 0, 0, 'RESULTS', 72); @@ -80,6 +83,15 @@ class ResultsSubState extends MusicBeatSubstate resultsTxt.updateHitbox(); add(resultsTxt); + versionShit.alpha = 0; + resultsTxt.alpha = 0; + titleTxt.alpha = 0; + + FlxTween.tween(bg, {alpha: 0.5}, 0.75, {ease: FlxEase.quadOut}); + FlxTween.tween(titleTxt, {alpha: 1}, 1, {ease: FlxEase.quadOut}); + FlxTween.tween(resultsTxt, {alpha: 1}, 2, {ease: FlxEase.quadOut}); + FlxTween.tween(versionShit, {alpha: 1}, 3, {ease: FlxEase.quadOut}); + super.create(); cameras = [FlxG.cameras.list[FlxG.cameras.list.length - 1]]; @@ -105,4 +117,4 @@ class ResultsSubState extends MusicBeatSubstate FlxG.sound.playMusic(Paths.music('freakyMenu')); } } -} +} \ No newline at end of file