From 6b67d0287487a673f25cfc228f378a35d2ef6e97 Mon Sep 17 00:00:00 2001 From: kelsey Date: Mon, 15 Sep 2025 19:32:28 +0100 Subject: [PATCH 1/2] add toggle for nmv splash screen --- .vscode/settings.json | 2 +- source/Init.hx | 2 +- source/funkin/data/ClientPrefs.hx | 2 ++ source/funkin/states/options/VisualsUISubState.hx | 5 +++++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 4130f87c..dfe76aed 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -57,7 +57,7 @@ }, ], "[haxe]": { - "editor.formatOnSave": true, + "editor.formatOnSave": false, "editor.formatOnSaveMode": "file", "editor.formatOnPaste": false, "editor.codeActionsOnSave": { diff --git a/source/Init.hx b/source/Init.hx index 55cf208f..c4b2adcf 100644 --- a/source/Init.hx +++ b/source/Init.hx @@ -85,7 +85,7 @@ class Init extends FlxState super.create(); - final nextState:Class = Main.startMeta.skipSplash ? Main.startMeta.initialState : Splash; + final nextState:Class = Main.startMeta.skipSplash || !ClientPrefs.toggleSplashScreen ? Main.startMeta.initialState : Splash; FlxG.switchState(() -> Type.createInstance(nextState, [])); } diff --git a/source/funkin/data/ClientPrefs.hx b/source/funkin/data/ClientPrefs.hx index c32f4fb9..53c63856 100644 --- a/source/funkin/data/ClientPrefs.hx +++ b/source/funkin/data/ClientPrefs.hx @@ -71,6 +71,8 @@ class ClientPrefs @saveVar public static var useEpicRankings:Bool = true; + @saveVar public static var toggleSplashScreen:Bool = true; + @saveVar public static var epicWindow:Float = 22.5; @saveVar public static var sickWindow:Float = 45.0; diff --git a/source/funkin/states/options/VisualsUISubState.hx b/source/funkin/states/options/VisualsUISubState.hx index 5f7ff290..ef41caff 100644 --- a/source/funkin/states/options/VisualsUISubState.hx +++ b/source/funkin/states/options/VisualsUISubState.hx @@ -1,5 +1,7 @@ package funkin.states.options; +import funkin.states.options.Option; + import flixel.FlxG; class VisualsUISubState extends BaseOptionsMenu @@ -55,6 +57,9 @@ class VisualsUISubState extends BaseOptionsMenu var option:Option = new Option('Camera Note Follow', "If unchecked, hitting notes will no longer have the camera follow in its direction.", 'camFollowsCharacters', 'bool', true); addOption(option); + var option:Option = new Option('Toggle NMV Splash Screen', "If unchecked, it will completely skip the splash screen upon the engine's boot up.", 'toggleSplashScreen', 'bool', true); + addOption(option); + super(); } From ebb1a200d27b78fc0f51b0c16fa62f76de10d258 Mon Sep 17 00:00:00 2001 From: data5 <99661153+FixedData@users.noreply.github.com> Date: Mon, 15 Sep 2025 13:10:59 -0600 Subject: [PATCH 2/2] revert this rq --- .vscode/settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index dfe76aed..4130f87c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -57,7 +57,7 @@ }, ], "[haxe]": { - "editor.formatOnSave": false, + "editor.formatOnSave": true, "editor.formatOnSaveMode": "file", "editor.formatOnPaste": false, "editor.codeActionsOnSave": {