ehhh

VsFoxaDevs · Apr 6, 2024 · 7c9e9f7 · 7c9e9f7
1 parent 62b08fa
commit 7c9e9f7
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 34 deletions.
diff --git a/crash-handler/src/CrashDialog.hx b/crash-handler/src/CrashDialog.hx
@@ -14,34 +14,30 @@ class CrashDialog
 		massive thanks to gedehari for the crash dialog code
 	 */
 	static final quotes:Array<String> = [
-		"oops - CharlesCatYT",
-		"Blueballed. - gedehari",
-		"bruh lmfao - CharlesCatYT",
-		"We have come for your errors- GET THE FUCK OUT OF MY CODE - CharlesCatYT",
-		"i hope you go mooseing and get fucked by a campfire - cyborg henry stickmin",
-		"Goodbye cruel world - ShadowMario",
+		"oops -CharlesCatYT",
+		"Blueballed. -gedehari",
+		"bruh lmfao -CharlesCatYT",
+		"i hope you go mooseing and get fucked by a campfire  cyborg henry stickmin",
 		"old was better - TheAnimateMan",
-		"what the actual fuck - cyborg henry stickmin",
-		"L - Dark",
-		"You did something, didn't you? - LightyStarOfficial",
-		"HA! - Dark",
-		"Ah bueno adios master - ShadowMario",
-		"Skibidy bah mmm dada *explodes* - ShadowMario",
-		"you aren't struggling, are you? - CharlesCatYT",
-		"WHY - CharlesCatYT",
-		"What have you done, you killed it! - crowplexus",
-		"Have you checked if the variable exists? - crowplexus",
-		"Have you even read the wiki before trying that? - crowplexus",
-		"you like the new crash handler? - CharlesCatYT",
-		"i love flixel - CharlesCatYT",
-		"i love openfl - CharlesCatYT",
-		"i love lime - CharlesCatYT",
-		"i love lua - CharlesCatYT",
-		"i love haxe - CharlesCatYT",
-		"i love hscript - CharlesCatYT",
-		"check for any semicolon, dude - CharlesCatYT",
-		"more null object references, okay... - CharlesCatYT",
-		"gedehari made the crash dialog but what happened? - CharlesCatYT"
+		"what the actual fuck -cyborg henry stickmin",
+		"L -Dark",
+		"You did something, didn't you? -LightyStarOfficial",
+		"HA! -Dark",
+		"you aren't struggling, are you? -CharlesCatYT",
+		"WHY -CharlesCatYT",
+		"What have you done, you killed it! -crowplexus",
+		"Have you checked if the variable exists? -crowplexus",
+		"Have you even read the wiki before trying that? -crowplexus",
+		"you like the new crash handler? -CharlesCatYT",
+		"i love flixel -CharlesCatYT",
+		"i love openfl -CharlesCatYT",
+		"i love lime -CharlesCatYT",
+		"i love lua -CharlesCatYT",
+		"i love haxe -CharlesCatYT",
+		"i love hscript -CharlesCatYT",
+		"check for any semicolon, dude -CharlesCatYT",
+		"more null object references, okay... -CharlesCatYT",
+		"gedehari made the crash dialog but what happened? -CharlesCatYT"
 	];
 
 	public static function main()
@@ -61,7 +57,7 @@ class CrashDialog
 				app.addComponent(mainView);
 
 				var messageLabel:Label = mainView.findComponent("message-label", Label);
-				messageLabel.text = quotes[Std.random(quotes.length)] + '\nUnfortunately, Alleyway Engine has crashed hard enough that the in-game crash handler didn\'t catch it.\nSorry about that.';
+				messageLabel.text = quotes[Std.random(quotes.length)] + '\n\nWell, Alleyway Engine crashed, that\'s a bummer.\nBut yeah, just figure it out.';
 				messageLabel.percentWidth = 100;
 				messageLabel.textAlign = "center";
 

diff --git a/source/states/editors/MasterEditorMenu.hx b/source/states/editors/MasterEditorMenu.hx
@@ -18,7 +18,6 @@ class MasterEditorMenu extends MusicBeatState {
 		'Credits Editor',
 		'Note Splash Editor',
 		//'Stage Editor'
-		'Mod Folder Setup'
 	];
 	private var grpTexts:FlxTypedGroup<Alphabet>;
 	private var directories:Array<String> = [null];
@@ -91,23 +90,24 @@ class MasterEditorMenu extends MusicBeatState {
 		if(controls.UI_LEFT_P) changeDirectory(-1);
 		if(controls.UI_RIGHT_P) changeDirectory(1);
 		#end
+		if(FlxG.keys.justPressed.END) FlxG.switchState(() -> new ModsSetupState()); 
 		if(controls.BACK) FlxG.switchState(() -> new MainMenuState());
 		if(controls.ACCEPT) {
 			switch(options[curSelected]) {
 				case 'Chart Editor'://felt it would be cool maybe -bbpanzu
-					LoadingState.loadAndSwitchState(() ->new ChartingState(), false);
+					LoadingState.loadAndSwitchState(() -> new ChartingState(), false);
 				case 'Character Editor':
-					LoadingState.loadAndSwitchState(() ->new CharacterEditorState(Character.DEFAULT_CHARACTER, false));
+					LoadingState.loadAndSwitchState(() -> new CharacterEditorState(Character.DEFAULT_CHARACTER, false));
 				case 'Week Editor':
 					FlxG.switchState(() -> new WeekEditorState());
 				case 'Credits Editor': //haoneRG made the credits editor btw lol!!!!
-					LoadingState.loadAndSwitchState(() ->new CreditsEditor(), false);
+					LoadingState.loadAndSwitchState(() -> new CreditsEditor(), false);
 				case 'Menu Character Editor':
 					FlxG.switchState(() -> new MenuCharacterEditorState());
 				case 'Dialogue Editor':
-					LoadingState.loadAndSwitchState(() ->new DialogueEditorState(), false);
+					LoadingState.loadAndSwitchState(() -> new DialogueEditorState(), false);
 				case 'Dialogue Portrait Editor':
-					LoadingState.loadAndSwitchState(() ->new DialogueCharacterEditorState(), false);
+					LoadingState.loadAndSwitchState(() -> new DialogueCharacterEditorState(), false);
 				case 'Note Splash Editor':
 					FlxG.switchState(() -> new NoteSplashDebugState());
 				case 'Mod Folder Setup':