Reworked Dialogue Music System

CamLikesKirby · Nov 2, 2024 · ded4801 · ded4801
1 parent 84f40e8
commit ded4801
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/mods/test/data/charts/test-dia.txt b/mods/test/data/charts/test-dia.txt
diff --git a/mods/test/data/charts/test-settings.json b/mods/test/data/charts/test-settings.json
@@ -2,6 +2,7 @@
     "songCreators": "Kawai Sprite & MtH",
     "songHeadings": "funkinHeading",
     "creditsTxt": "The testiest song on the planet",
+    "dialogueMusic": "DaveDialogue",
     "hasNoGf": false,
     "intro": "",
     "windowName": "",

diff --git a/mods/test/data/dialogue/test-endDialogue.txt b/mods/test/data/dialogue/test-endDialogue.txt
@@ -0,0 +1,3 @@
+:dave,festival-exhausted:Testing
+:generic:Testing
+:generic:1 2 3
diff --git a/source/DialogueBox.hx b/source/DialogueBox.hx
@@ -61,7 +61,7 @@ class DialogueBox extends FlxSpriteGroup
 	var debug:Bool = false;
 
 	var curshader:Dynamic;
-	var custom:Array<String>;
+	var custom:String;
 
 	public var rawJsonDial:String;
     public var jsonDial:DiaCharacter;
@@ -78,8 +78,10 @@ class DialogueBox extends FlxSpriteGroup
 	{
 		super();
 
-		if (FileSystem.exists(TitleState.modFolder + '/data/charts/' + PlayState.SONG.song.toLowerCase() + '-dia.txt')) {
-			custom = CoolUtil.coolTextFile(TitleState.modFolder + '/data/charts/' + PlayState.SONG.song.toLowerCase() + '-dia.txt');
+		if (PlayState.settingsExist && PlayState.jsonSettings.dialogueMusic != null) {
+			custom = PlayState.jsonSettings.dialogueMusic;
+			} else {
+			custom = '';
 			}
 
 		if (playMusic)
@@ -120,19 +122,13 @@ class DialogueBox extends FlxSpriteGroup
 				case 'rano':
 					FlxG.sound.playMusic(Paths.music('stocknightambianceforranolol'), 0);	
 				default:
-					if (FileSystem.exists(TitleState.modFolder + '/data/charts/' + PlayState.SONG.song.toLowerCase() + '-dia.txt')) {
-						for (i in 0...custom.length)
-							{
-								var data:Array<String> = custom[i].split(':');
-								if (data[0] == null) {
+					if (PlayState.settingsExist) {
+								if (custom == '') {
 								FlxG.sound.music.stop();
 								} else {
-								FlxG.sound.playMusic(Paths.music(data[0]), 0);	
+								FlxG.sound.playMusic(Paths.music(custom), 0);	
 								}
 							}
-					} else {
-					FlxG.sound.music.stop();
-					}
 			}
 			FlxG.sound.music.fadeIn(1, 0, 0.8);
 		}

diff --git a/source/PlayState.hx b/source/PlayState.hx
@@ -134,6 +134,7 @@ typedef Settings = {
     var songCreators:String;
     var songHeadings:String;
     var creditsTxt:String;
+	var dialogueMusic:String;
     var hasNoGf:Bool;
     var intro:String;
     var windowName:String;