From 9d016afbb490038cd5825524eec3910635312bfe Mon Sep 17 00:00:00 2001 From: Microkat <89645987+KadePleaseHelpMe@users.noreply.github.com> Date: Mon, 16 Dec 2024 20:40:45 -0500 Subject: [PATCH 1/6] Update MainMenuState.hx comment --- source/funkin/menus/MainMenuState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/funkin/menus/MainMenuState.hx b/source/funkin/menus/MainMenuState.hx index 968494f17..0b7720ff6 100644 --- a/source/funkin/menus/MainMenuState.hx +++ b/source/funkin/menus/MainMenuState.hx @@ -95,7 +95,7 @@ class MainMenuState extends MusicBeatState if (!selectedSomethin) { if (canAccessDebugMenus) { - if (FlxG.keys.justPressed.SEVEN) { + if (FlxG.keys.justPressed.SEVEN) { // why is this the only FlxG.keys reference 😭 persistentUpdate = false; persistentDraw = true; openSubState(new funkin.editors.EditorPicker()); From c75733242a88620a1ec510de92e41d721e6a2b1f Mon Sep 17 00:00:00 2001 From: Microkat <89645987+KadePleaseHelpMe@users.noreply.github.com> Date: Mon, 16 Dec 2024 20:42:23 -0500 Subject: [PATCH 2/6] Update Controls.hx --- source/funkin/backend/system/Controls.hx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/funkin/backend/system/Controls.hx b/source/funkin/backend/system/Controls.hx index a09da1c74..6188cca4d 100644 --- a/source/funkin/backend/system/Controls.hx +++ b/source/funkin/backend/system/Controls.hx @@ -686,6 +686,7 @@ class Controls extends FlxActionSet inline bindKeys(Control.BACK, Options.SOLO_BACK); inline bindKeys(Control.PAUSE, Options.SOLO_PAUSE); inline bindKeys(Control.RESET, Options.SOLO_RESET); + inline bindKeys(Control.CHEAT, Options.SOLO_CHEAT); inline bindKeys(Control.SWITCHMOD, Options.SOLO_SWITCHMOD); case Duo(true): inline bindKeys(Control.UP, Options.P1_UP); @@ -700,6 +701,7 @@ class Controls extends FlxActionSet inline bindKeys(Control.BACK, Options.P1_BACK); inline bindKeys(Control.PAUSE, Options.P1_PAUSE); inline bindKeys(Control.RESET, Options.P1_RESET); + inline bindKeys(Control.CHEAT, Options.P1_CHEAT); inline bindKeys(Control.SWITCHMOD, Options.P1_SWITCHMOD); case Duo(false): inline bindKeys(Control.UP, Options.P2_UP); @@ -714,6 +716,7 @@ class Controls extends FlxActionSet inline bindKeys(Control.BACK, Options.P2_BACK); inline bindKeys(Control.PAUSE, Options.P2_PAUSE); inline bindKeys(Control.RESET, Options.P2_RESET); + inline bindKeys(Control.CHEAT, Options.P2_CHEAT); inline bindKeys(Control.SWITCHMOD, Options.P2_SWITCHMOD); case None: // nothing case Custom: // nothing From 71e85424408071d8b1c8183b987c38dcdf6178d1 Mon Sep 17 00:00:00 2001 From: Microkat <89645987+KadePleaseHelpMe@users.noreply.github.com> Date: Mon, 16 Dec 2024 20:42:42 -0500 Subject: [PATCH 3/6] Update Options.hx --- source/funkin/options/Options.hx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/funkin/options/Options.hx b/source/funkin/options/Options.hx index a9bf72ac1..e27606ac3 100644 --- a/source/funkin/options/Options.hx +++ b/source/funkin/options/Options.hx @@ -83,6 +83,7 @@ class Options public static var P1_BACK:Array = [BACKSPACE]; public static var P1_PAUSE:Array = [ENTER]; public static var P1_RESET:Array = [R]; + public static var P1_CHEAT:Array = [SEVEN]; public static var P1_SWITCHMOD:Array = [TAB]; /** @@ -100,6 +101,7 @@ class Options public static var P2_BACK:Array = [ESCAPE]; public static var P2_PAUSE:Array = [ESCAPE]; public static var P2_RESET:Array = []; + public static var P2_CHEAT:Array = []; public static var P2_SWITCHMOD:Array = []; /** @@ -117,6 +119,7 @@ class Options public static var SOLO_BACK(get, null):Array; public static var SOLO_PAUSE(get, null):Array; public static var SOLO_RESET(get, null):Array; + public static var SOLO_CHEAT(get, null):Array; public static var SOLO_SWITCHMOD(get, null):Array; public static function load() { From 6a1eea33d2217160427490704a543225b6f97e17 Mon Sep 17 00:00:00 2001 From: Microkat <89645987+KadePleaseHelpMe@users.noreply.github.com> Date: Mon, 16 Dec 2024 20:43:01 -0500 Subject: [PATCH 4/6] Update KeybindsOptions.hx --- source/funkin/options/keybinds/KeybindsOptions.hx | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/source/funkin/options/keybinds/KeybindsOptions.hx b/source/funkin/options/keybinds/KeybindsOptions.hx index e4e7d26cd..777866e33 100644 --- a/source/funkin/options/keybinds/KeybindsOptions.hx +++ b/source/funkin/options/keybinds/KeybindsOptions.hx @@ -26,7 +26,7 @@ class KeybindsOptions extends MusicBeatSubstate { { name: '{noteRight}', control: 'NOTE_RIGHT' - }, + } ] }, { @@ -63,16 +63,20 @@ class KeybindsOptions extends MusicBeatSubstate { { name: 'Pause', control: 'PAUSE' - }, + } ] }, { name: 'Engine', settings: [ + { + name: 'Cheat', + control: 'CHEAT' + }, { name: 'Switch Mod', control: 'SWITCHMOD' - }, + } ] } ]; @@ -248,4 +252,4 @@ class KeybindsOptions extends MusicBeatSubstate { camFollow.setPosition(FlxG.width / 2, FlxG.height / 2); } } -} \ No newline at end of file +} From af2fb796d8ca417199a862494626fd5286a392d9 Mon Sep 17 00:00:00 2001 From: Microkat <89645987+KadePleaseHelpMe@users.noreply.github.com> Date: Mon, 16 Dec 2024 20:43:18 -0500 Subject: [PATCH 5/6] Update MainMenuState.hx --- source/funkin/menus/MainMenuState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/funkin/menus/MainMenuState.hx b/source/funkin/menus/MainMenuState.hx index 0b7720ff6..b9d6a2d5e 100644 --- a/source/funkin/menus/MainMenuState.hx +++ b/source/funkin/menus/MainMenuState.hx @@ -95,7 +95,7 @@ class MainMenuState extends MusicBeatState if (!selectedSomethin) { if (canAccessDebugMenus) { - if (FlxG.keys.justPressed.SEVEN) { // why is this the only FlxG.keys reference 😭 + if (controls.CHEAT) { persistentUpdate = false; persistentDraw = true; openSubState(new funkin.editors.EditorPicker()); From 1825f43d68f01af43bdc715b6017db10890032f2 Mon Sep 17 00:00:00 2001 From: Microkat <89645987+KadePleaseHelpMe@users.noreply.github.com> Date: Mon, 16 Dec 2024 20:43:35 -0500 Subject: [PATCH 6/6] Update PlayState.hx --- source/funkin/game/PlayState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 1b5bf86c9..c87e347ff 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -1257,7 +1257,7 @@ class PlayState extends MusicBeatState pauseGame(); if (canAccessDebugMenus) { - if (chartingMode && FlxG.keys.justPressed.SEVEN) { + if (chartingMode && controls.CHEAT) { FlxG.switchState(new funkin.editors.charter.Charter(SONG.meta.name, difficulty, false)); } if (FlxG.keys.justPressed.F5) {