diff --git a/.prettierignore b/.prettierignore index 2e132c06f..ccf886f1a 100644 --- a/.prettierignore +++ b/.prettierignore @@ -9,3 +9,5 @@ assets/weekend1/images # Don't ignore data files # TODO: These don't work. !assets/preload/data/ + +assets/exclude/data/credits.json diff --git a/assets b/assets index 3f3977d7b..0e0781121 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 3f3977d7bf82856106e9c74fa11433c67b160323 +Subproject commit 0e07811217c579df376719c76d47c1e08b3070e2 diff --git a/source/funkin/play/song/Song.hx b/source/funkin/play/song/Song.hx index d219dc2f6..e71ae3213 100644 --- a/source/funkin/play/song/Song.hx +++ b/source/funkin/play/song/Song.hx @@ -609,28 +609,33 @@ class SongDifficulty return cast events; } - public function cacheInst(instrumental = ''):Void + public function getInstPath(instrumental = ''):String { if (characters != null) { if (instrumental != '' && characters.altInstrumentals.contains(instrumental)) { var instId = '-$instrumental'; - FlxG.sound.cache(Paths.inst(this.song.id, instId)); + return Paths.inst(this.song.id, instId); } else { // Fallback to default instrumental. var instId = (characters.instrumental ?? '') != '' ? '-${characters.instrumental}' : ''; - FlxG.sound.cache(Paths.inst(this.song.id, instId)); + return Paths.inst(this.song.id, instId); } } else { - FlxG.sound.cache(Paths.inst(this.song.id)); + return Paths.inst(this.song.id); } } + public function cacheInst(instrumental = ''):Void + { + FlxG.sound.cache(getInstPath(instrumental)); + } + public function playInst(volume:Float = 1.0, looped:Bool = false):Void { var suffix:String = (variation != null && variation != '' && variation != 'default') ? '-$variation' : ''; diff --git a/source/funkin/ui/credits/CreditsState.hx b/source/funkin/ui/credits/CreditsState.hx index d43e25114..6a15f1263 100644 --- a/source/funkin/ui/credits/CreditsState.hx +++ b/source/funkin/ui/credits/CreditsState.hx @@ -185,7 +185,7 @@ class CreditsState extends MusicBeatState } else if (controls.PAUSE) { - scrollPaused = !scrollPaused; + // scrollPaused = !scrollPaused; } } @@ -196,7 +196,7 @@ class CreditsState extends MusicBeatState function exit():Void { - FlxG.switchState(new funkin.ui.mainmenu.MainMenuState()); + FlxG.switchState(funkin.ui.mainmenu.MainMenuState.new); } public override function destroy():Void diff --git a/source/funkin/ui/transition/LoadingState.hx b/source/funkin/ui/transition/LoadingState.hx index ec6621ee3..3b53e1b4a 100644 --- a/source/funkin/ui/transition/LoadingState.hx +++ b/source/funkin/ui/transition/LoadingState.hx @@ -77,7 +77,7 @@ class LoadingState extends MusicBeatSubState var difficulty:String = playParams.targetDifficulty ?? Constants.DEFAULT_DIFFICULTY; var variation:String = playParams.targetVariation ?? Constants.DEFAULT_VARIATION; var targetChart:SongDifficulty = playParams.targetSong?.getDifficulty(difficulty, variation); - var instPath:String = Paths.inst(targetChart.song.id); + var instPath:String = targetChart.getInstPath(playParams.targetInstrumental); var voicesPaths:Array = targetChart.buildVoiceList(); checkLoadSong(instPath);