custom countdown sounds for songs

notweuz · Apr 28, 2022 · f6e4c8a · f6e4c8a
1 parent 3b23754
commit f6e4c8a
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 7 deletions.
diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx
@@ -25,7 +25,7 @@ using StringTools;
 
 class MainMenuState extends MusicBeatState
 {
-	public static var osEngineVesrion:String = '0.1.0'; //This is also used for Discord RPC
+	public static var osEngineVesrion:String = '0.1.2'; //This is also used for Discord RPC
 	public static var curSelected:Int = 0;
 
 	var menuItems:FlxTypedGroup<FlxSprite>;

diff --git a/source/Paths.hx b/source/Paths.hx
@@ -396,6 +396,10 @@ class Paths
 		return modFolders('data/' + key + '.json');
 	}
 
+	inline static public function modsSongs(song:String, key:String) {
+		return modFolders('songs/' + song + '/' + key + '.' + SOUND_EXT);
+	}
+
 	inline static public function modsVideo(key:String) {
 		return modFolders('videos/' + key + '.' + VIDEO_EXT);
 	}

diff --git a/source/PlayState.hx b/source/PlayState.hx
@@ -1425,6 +1425,7 @@ class PlayState extends MusicBeatState
 			callOnLuas('onStartCountdown', []);
 			return;
 		}
+		var songName:String = Paths.formatToSongPath(SONG.song).toLowerCase();
 
 		inCutscene = false;
 		var ret:Dynamic = callOnLuas('onStartCountdown', []);
@@ -1492,8 +1493,13 @@ class PlayState extends MusicBeatState
 
 				switch (swagCounter)
 				{
-					case 0:
-						FlxG.sound.play(Paths.sound('intro3' + introSoundsSuffix), 0.6);
+					case 0:	
+						//trace(songName);
+						if (FileSystem.exists(Paths.modsSounds('sounds', songName + '+' + 'intro3'))) {
+							FlxG.sound.play(Paths.sound(songName + '+' + 'intro3', 'ogg'), 0.6);
+						} else {
+							FlxG.sound.play(Paths.sound('intro3' + introSoundsSuffix), 0.6);
+						}
 					case 1:
 						countdownReady = new FlxSprite().loadGraphic(Paths.image(introAlts[0]));
 						countdownReady.scrollFactor.set();
@@ -1513,7 +1519,11 @@ class PlayState extends MusicBeatState
 								countdownReady.destroy();
 							}
 						});
-						FlxG.sound.play(Paths.sound('intro2' + introSoundsSuffix), 0.6);
+						if (FileSystem.exists(Paths.modsSounds('sounds', songName + '+' + 'intro2'))) {
+							FlxG.sound.play(Paths.sound(songName + '+' + 'intro2', 'ogg'), 0.6);
+						} else {
+							FlxG.sound.play(Paths.sound('intro2' + introSoundsSuffix), 0.6);
+						}
 					case 2:
 						countdownSet = new FlxSprite().loadGraphic(Paths.image(introAlts[1]));
 						countdownSet.scrollFactor.set();
@@ -1532,7 +1542,11 @@ class PlayState extends MusicBeatState
 								countdownSet.destroy();
 							}
 						});
-						FlxG.sound.play(Paths.sound('intro1' + introSoundsSuffix), 0.6);
+						if (FileSystem.exists(Paths.modsSounds('sounds', songName + '+' + 'intro1'))) {
+							FlxG.sound.play(Paths.sound(songName + '+' + 'intro1', 'ogg'), 0.6);
+						} else {
+							FlxG.sound.play(Paths.sound('intro1' + introSoundsSuffix), 0.6);
+						}
 					case 3:
 						countdownGo = new FlxSprite().loadGraphic(Paths.image(introAlts[2]));
 						countdownGo.scrollFactor.set();
@@ -1553,7 +1567,11 @@ class PlayState extends MusicBeatState
 								countdownGo.destroy();
 							}
 						});
-						FlxG.sound.play(Paths.sound('introGo' + introSoundsSuffix), 0.6);
+						if (FileSystem.exists(Paths.modsSounds('sounds', songName + '+' + 'introGo'))) {
+							FlxG.sound.play(Paths.sound(songName + '+' + 'introGo', 'ogg'), 0.6);
+						} else {
+							FlxG.sound.play(Paths.sound('introGo' + introSoundsSuffix), 0.6);
+						}
 					case 4:
 				}
 

diff --git a/source/editors/ChartingState.hx b/source/editors/ChartingState.hx
@@ -2712,7 +2712,7 @@ class ChartingState extends MusicBeatState
 	function loadJson(song:String):Void
 	{
 		//make it look sexier if possible
-		if (CoolUtil.difficulties[PlayState.storyDifficulty] != "Normal"){
+		if (CoolUtil.difficulties[PlayState.storyDifficulty] != null && CoolUtil.difficulties[PlayState.storyDifficulty] != "Normal"){
 		PlayState.SONG = Song.loadFromJson(song.toLowerCase()+"-"+CoolUtil.difficulties[PlayState.storyDifficulty], song.toLowerCase());
 
 		}else{