From 0fcea638c69f0359f93fe730bb20bd8aac55f260 Mon Sep 17 00:00:00 2001 From: CharlesCatYT Date: Fri, 27 Sep 2024 23:23:02 -0400 Subject: [PATCH] z --- source/funkin/ui/title/TitleState.hx | 12 +++--------- source/funkin/ui/transition/LoadingState.hx | 7 ++++++- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/source/funkin/ui/title/TitleState.hx b/source/funkin/ui/title/TitleState.hx index 4eb0b92a..cdcc65f2 100644 --- a/source/funkin/ui/title/TitleState.hx +++ b/source/funkin/ui/title/TitleState.hx @@ -271,23 +271,17 @@ class TitleState extends MusicBeatState #end #if desktop - if (FlxG.keys.justPressed.ESCAPE) - { - Sys.exit(0); - } + if (FlxG.keys.justPressed.ESCAPE) Sys.exit(0); #end - if (Save.instance.charactersSeen.contains("pico")) + if (Save.instance.charactersSeen.contains("pico") && false) // this fix doesnt really matter cuz the save data just doesnt work lol { Save.instance.charactersSeen.remove("pico"); Save.instance.oldChar = false; } Conductor.instance.update(); - if (FlxG.keys.justPressed.I) - { - FlxTween.tween(outlineShaderShit, {funnyX: 50, funnyY: 50}, 0.6, {ease: FlxEase.quartOut}); - } + if (FlxG.keys.justPressed.I) FlxTween.tween(outlineShaderShit, {funnyX: 50, funnyY: 50}, 0.6, {ease: FlxEase.quartOut}); if (FlxG.keys.pressed.D) outlineShaderShit.funnyX += 1; // outlineShaderShit.xPos.value[0] += 1; diff --git a/source/funkin/ui/transition/LoadingState.hx b/source/funkin/ui/transition/LoadingState.hx index 374691ae..13e2a011 100644 --- a/source/funkin/ui/transition/LoadingState.hx +++ b/source/funkin/ui/transition/LoadingState.hx @@ -220,7 +220,7 @@ class LoadingState extends MusicBeatSubState params.targetVariation ?? Constants.DEFAULT_VARIATION); var daStage = funkin.data.stage.StageRegistry.instance.fetchEntry(daChart.stage); - stageDirectory = daStage?._data?.directory ?? "shared"; + stageDirectory = daStage?._data?.directory ?? "shared"; Paths.setCurrentLevel(stageDirectory); var playStateCtor:() -> PlayState = function() { @@ -327,6 +327,11 @@ class LoadingState extends MusicBeatSubState FunkinSprite.cacheTexture(Paths.image('noteStrumline', 'shared')); FunkinSprite.cacheTexture(Paths.image('NOTE_hold_assets')); + FunkinSprite.cacheTexture(Paths.image('holdCoverRed', 'shared')); // you forgot hold covers + FunkinSprite.cacheTexture(Paths.image('holdCoverPurple', 'shared')); + FunkinSprite.cacheTexture(Paths.image('holdCoverGreen', 'shared')); + FunkinSprite.cacheTexture(Paths.image('holdCoverBlue', 'shared')); + FunkinSprite.cacheTexture(Paths.image('ui/countdown/funkin/ready', 'shared')); FunkinSprite.cacheTexture(Paths.image('ui/countdown/funkin/set', 'shared')); FunkinSprite.cacheTexture(Paths.image('ui/countdown/funkin/go', 'shared'));