diff --git a/source/funkin/backend/MusicBeatState.hx b/source/funkin/backend/MusicBeatState.hx index 801794ec..d2c5fa60 100644 --- a/source/funkin/backend/MusicBeatState.hx +++ b/source/funkin/backend/MusicBeatState.hx @@ -161,10 +161,12 @@ class MusicBeatState extends FlxState implements IBeatReceiver super.createPost(); persistentUpdate = true; call("postCreate"); - if (!skipTransIn) - startTransition(null); - skipTransIn = false; - skipTransOut = false; + if(!Flags.DISABLE_TRANSITIONS) { + if (!skipTransIn) + startTransition(null); + skipTransIn = false; + skipTransOut = false; + } } public function startTransition(?newState:FlxState, skipSubStates:Bool = false):Bool { @@ -282,6 +284,9 @@ class MusicBeatState extends FlxState implements IBeatReceiver if (e.cancelled) return false; + if(Flags.DISABLE_TRANSITIONS) + return true; + if (skipTransOut || (subState is MusicBeatTransition && cast(subState, MusicBeatTransition).newState != null)) return true; startTransition(e.substate); diff --git a/source/funkin/backend/system/Flags.hx b/source/funkin/backend/system/Flags.hx index 03a6b48c..1a28c222 100644 --- a/source/funkin/backend/system/Flags.hx +++ b/source/funkin/backend/system/Flags.hx @@ -99,7 +99,6 @@ class Flags { public static var DEFAULT_CUTSCENE_PAUSE_ITEMS:Array = ['Resume Cutscene', 'Skip Cutscene', 'Restart Cutscene', 'Exit to menu']; public static var DEFAULT_GITAROO:Bool = true; public static var GITAROO_CHANCE:Float = 0.1; - public static var DEFAULT_CAN_ACCESS_DEBUG_MENUS:Bool = true; public static var DEFAULT_MUTE_VOCALS_ON_MISS:Bool = true; public static var DEFAULT_MAX_HEALTH:Float = 2.0; @@ -132,6 +131,10 @@ class Flags { public static var UNDO_PREFIX:String = "* "; public static var JSON_PRETTY_PRINT:String = "\t"; + + public static var DISABLE_EDITORS:Bool = false; + public static var DISABLE_BETA_WARNING_SCREEN:Bool = false; + public static var DISABLE_TRANSITIONS:Bool = false; // -- End of Codename's Default Flags -- /** diff --git a/source/funkin/backend/system/MainState.hx b/source/funkin/backend/system/MainState.hx index cfe18642..6eaeade4 100644 --- a/source/funkin/backend/system/MainState.hx +++ b/source/funkin/backend/system/MainState.hx @@ -66,12 +66,11 @@ class MainState extends FlxState { if(Framerate.isLoaded) Framerate.instance.reload(); - if (betaWarningShown) + if (Flags.DISABLE_BETA_WARNING_SCREEN || betaWarningShown) FlxG.switchState(new TitleState()); - else { + else FlxG.switchState(new BetaWarningState()); - betaWarningShown = true; - } + betaWarningShown = true; #if sys CoolUtil.safeAddAttributes('./.temp/', NativeAPI.FileAttribute.HIDDEN); diff --git a/source/funkin/editors/EditorPicker.hx b/source/funkin/editors/EditorPicker.hx index 136b2efd..a6b70d54 100644 --- a/source/funkin/editors/EditorPicker.hx +++ b/source/funkin/editors/EditorPicker.hx @@ -34,7 +34,7 @@ class EditorPicker extends MusicBeatSubstate { iconID: 5, state: null, onClick: function() { - CoolUtil.openURL("https://fnf-cne-devs.github.io/"); + CoolUtil.openURL("https://codename-engine.com/"); } }, { diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index b8f2e75f..a7d8d17b 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -215,7 +215,7 @@ class PlayState extends MusicBeatState /** * Whenever the player can press 7, 8 or 9 to access the debug menus. */ - public var canAccessDebugMenus:Bool = Flags.DEFAULT_CAN_ACCESS_DEBUG_MENUS; + public var canAccessDebugMenus:Bool = !Flags.DISABLE_EDITORS; /** * Whether or not to show the secret gitaroo pause. */ @@ -1300,14 +1300,14 @@ class PlayState extends MusicBeatState if (chartingMode && FlxG.keys.justPressed.SEVEN) { FlxG.switchState(new funkin.editors.charter.Charter(SONG.meta.name, difficulty, false)); } - if (FlxG.keys.justPressed.F5) { + /*if (FlxG.keys.justPressed.F5) { Logs.trace('[PlayState] Reloading scripts...', WARNING, YELLOW); scripts.reload(); Logs.trace('[PlayState] Song scripts successfully reloaded.', WARNING, GREEN); - } + }*/ } - if (doIconBop) { + if (doIconBop) { var iconLerp = Flags.ICON_LERP; iconP1.scale.set(lerp(iconP1.scale.x, 1, iconLerp), lerp(iconP1.scale.y, 1, iconLerp)); iconP2.scale.set(lerp(iconP2.scale.x, 1, iconLerp), lerp(iconP2.scale.y, 1, iconLerp)); @@ -1870,7 +1870,7 @@ class PlayState extends MusicBeatState camHUD.zoom += Flags.HUD_BOP_STRENGTH * camZoomingStrength; } - if (doIconBop) + if (doIconBop) { var iconScale = Flags.BOP_ICON_SCALE; iconP1.scale.set(iconScale, iconScale); diff --git a/source/funkin/menus/MainMenuState.hx b/source/funkin/menus/MainMenuState.hx index 5f580868..325b7024 100644 --- a/source/funkin/menus/MainMenuState.hx +++ b/source/funkin/menus/MainMenuState.hx @@ -25,7 +25,7 @@ class MainMenuState extends MusicBeatState var camFollow:FlxObject; var versionText:FunkinText; - public var canAccessDebugMenus:Bool = Flags.DEFAULT_CAN_ACCESS_DEBUG_MENUS; + public var canAccessDebugMenus:Bool = !Flags.DISABLE_EDITORS; override function create() {