character specific pause music support

Vortex2Oblivion · Nov 3, 2024 · 97399cf · 97399cf
1 parent fb0b472
commit 97399cf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/mods/Friday Night Funkin'/shared/music/breakfast-pico.ogg b/mods/Friday Night Funkin'/shared/music/breakfast-pico.ogg
diff --git a/source/substates/PauseSubState.hx b/source/substates/PauseSubState.hx
@@ -16,6 +16,7 @@ import flixel.text.FlxText;
 import flixel.tweens.FlxEase;
 import flixel.tweens.FlxTween;
 import flixel.util.FlxColor;
+import openfl.utils.Assets;
 import ui.Option;
 
 using StringTools;
@@ -32,7 +33,10 @@ class PauseSubState extends MusicBeatSubstate {
 
 	var menu:String = "default";
 
-	var pauseMusic:FlxSound = new FlxSound().loadEmbedded(Paths.music('breakfast'), true, true);
+	var pauseMusic:FlxSound = new FlxSound().loadEmbedded(Paths.music('breakfast'
+		+ (Assets.exists(Paths.music('breakfast-' + PlayState.boyfriend.curCharacter, 'shared')) ? '-' + PlayState.boyfriend.curCharacter : ''),
+		'shared'),
+		true, true);
 
 	var pauseCamera:FlxCamera = new FlxCamera();
 
@@ -95,9 +99,12 @@ class PauseSubState extends MusicBeatSubstate {
 
 	var holdTime:Float = 0;
 
+	public var MAX_MUSIC_VOLUME:Float = 0.5;
+	public var MUSIC_INCREASE_SPEED:Float = 0.02;
+
 	override function update(elapsed:Float) {
-		if (pauseMusic.volume < 0.5)
-			pauseMusic.volume += 0.01 * elapsed;
+		if (pauseMusic.volume < MAX_MUSIC_VOLUME)
+			pauseMusic.volume += MUSIC_INCREASE_SPEED * elapsed;
 
 		super.update(elapsed);