Merge pull request KadeArchive#1662 from CyndaquilDAC/cleaner-dialogu…

…e-code

Cleaner dialogue code

assets/preload/data/roses/rosesDialogue.txt → assets/preload/data/roses/dialogue.txt

@@ -1,3 +1,3 @@
-:dad:Not bad for an ugly worm.
-:dad:But this time I'll rip your nuts off right after your girlfriend finishes gargling mine.
+:dad:Not bad for an ugly worm.
+:dad:But this time I'll rip your nuts off right after your girlfriend finishes gargling mine.
 :bf:Bop beep be be skdoo bep

assets/preload/data/senpai/senpaiDialogue.txt → assets/preload/data/senpai/dialogue.txt

@@ -1,3 +1,3 @@
-:dad:Ah, a new fair maiden has come in search of true love!
-:dad:A serenade between gentlemen shall decide where her beautiful heart shall reside.
+:dad:Ah, a new fair maiden has come in search of true love!
+:dad:A serenade between gentlemen shall decide where her beautiful heart shall reside.
 :bf:Beep bo bop

assets/preload/data/thorns/thornsDialogue.txt → assets/preload/data/thorns/dialogue.txt

@@ -1,5 +1,5 @@
-:dad:Direct contact with real humans, after being trapped in here for so long...
-:dad:and HER of all people.
-:dad:I'll make her father pay for what he's done to me and all the others,,,,
-:dad:I'll beat you and make you take my place.
+:dad:Direct contact with real humans, after being trapped in here for so long...
+:dad:and HER of all people.
+:dad:I'll make her father pay for what he's done to me and all the others,,,,
+:dad:I'll beat you and make you take my place.
 :dad:You don't mind your bodies being borrowed right? It's only fair...

source/PlayState.hx

@@ -456,32 +456,11 @@ class PlayState extends MusicBeatState
 		trace('INFORMATION ABOUT WHAT U PLAYIN WIT:\nFRAMES: ' + PlayStateChangeables.safeFrames + '\nZONE: ' + Conductor.safeZoneOffset + '\nTS: '
 			+ Conductor.timeScale + '\nBotPlay : ' + PlayStateChangeables.botPlay);
 
-		// dialogue shit
-		switch (songLowercase)
+		switch(songLowercase)
 		{
-			case 'tutorial':
-				dialogue = ["Hey you're pretty cute.", 'Use the arrow keys to keep up \nwith me singing.'];
-			case 'bopeebo':
-				dialogue = [
-					'HEY!',
-					"You think you can just sing\nwith my daughter like that?",
-					"If you want to date her...",
-					"You're going to have to go \nthrough ME first!"
-				];
-			case 'fresh':
-				dialogue = ["Not too shabby boy.", ""];
-			case 'dadbattle':
-				dialogue = [
-					"gah you think you're hot stuff?",
-					"If you can beat me here...",
-					"Only then I will even CONSIDER letting you\ndate my daughter!"
-				];
-			case 'senpai':
-				dialogue = CoolUtil.coolTextFile(Paths.txt('data/senpai/senpaiDialogue'));
-			case 'roses':
-				dialogue = CoolUtil.coolTextFile(Paths.txt('data/roses/rosesDialogue'));
-			case 'thorns':
-				dialogue = CoolUtil.coolTextFile(Paths.txt('data/thorns/thornsDialogue'));
+			//if the song has dialogue, so we don't accidentally try to load a nonexistant file and crash the game
+			case 'senpai' | 'roses' | 'thorns':
+				dialogue = CoolUtil.coolTextFile(Paths.txt('data/' + songLowercase + '/dialogue'));
 		}
 
 		// defaults if no stage was found in chart