make volume settings carry over to playtest

Author: KoloInDaCrib

source/funkin/play/PlayState.hx

@@ -141,6 +141,28 @@ typedef PlayStateParams =
    * Used to persist the position of the `cameraFollowPosition` between levels.
    */
   ?cameraFollowPoint:FlxPoint,
+  /**
+   * The volume parameters for music tracks.
+   */
+  ?volume:PlayStateVolumeParams
+}
+
+typedef PlayStateVolumeParams =
+{
+  /**
+   * The volume of the instrumental.
+   */
+  var ?inst:Float;
+
+  /**
+   * The volume of the player vocals.
+   */
+  var ?player:Float;
+
+  /**
+   * The volume of the opponent vocals.
+   */
+  var ?opponent:Float;
 }
 
 /**
@@ -239,6 +261,24 @@ class PlayState extends MusicBeatSubState
    */
   public var playbackRate:Float = 1.0;
 
+  /**
+   * The volume of the instrumental track.
+   * @default `1.0` for 100%.
+   */
+  public var instrumentalVolume:Float = 1.0;
+
+  /**
+   * The volume of the player vocals track.
+   * @default `1.0` for 100%.
+   */
+  public var playerVocalsVolume:Float = 1.0;
+
+  /**
+   * The volume of the opponent vocals track.
+   * @default `1.0` for 100%.
+   */
+  public var opponentVocalsVolume:Float = 1.0;
+
   /**
    * An empty FlxObject contained in the scene.
    * The current gameplay camera will always follow this object. Tween its position to move the camera smoothly.
@@ -712,6 +752,10 @@ class PlayState extends MusicBeatSubState
     overrideMusic = params.overrideMusic ?? false;
     previousCameraFollowPoint = params.cameraFollowPoint;
 
+    instrumentalVolume = params.volume?.inst ?? 1.0;
+    playerVocalsVolume = params.volume?.player ?? 1.0;
+    opponentVocalsVolume = params.volume?.opponent ?? 1.0;
+
     // Basic object initialization
 
     // TODO: Add something to toggle this on!
@@ -1028,16 +1072,15 @@ class PlayState extends MusicBeatSubState
         }
       }
 
-      if (FlxG.sound.music != null) FlxG.sound.music.volume = 1;
+      if (FlxG.sound.music != null) FlxG.sound.music.volume = instrumentalVolume;
 
       if (vocals != null)
       {
         vocals.pause();
         vocals.time = startTimestamp - Conductor.instance.instrumentalOffset;
 
-        vocals.volume = 1;
-        vocals.playerVolume = 1;
-        vocals.opponentVolume = 1;
+        vocals.playerVolume = playerVocalsVolume;
+        vocals.opponentVolume = opponentVocalsVolume;
       }
 
       if (!fromDeathState)
@@ -2512,7 +2555,7 @@ class PlayState extends MusicBeatSubState
     }
 
     // Prevent the volume from being wrong.
-    FlxG.sound.music.volume = 1.0;
+    FlxG.sound.music.volume = instrumentalVolume;
     if (FlxG.sound.music.fadeTween != null) FlxG.sound.music.fadeTween.cancel();
 
     if (vocals != null)
@@ -2522,7 +2565,8 @@ class PlayState extends MusicBeatSubState
 
       vocals.time = startTimestamp - Conductor.instance.instrumentalOffset;
       vocals.pitch = playbackRate;
-      vocals.volume = 1.0;
+      vocals.playerVolume = playerVocalsVolume;
+      vocals.opponentVolume = opponentVocalsVolume;
 
       // trace('STARTING SONG AT:');
       // trace('${FlxG.sound.music.time}');
@@ -2986,7 +3030,7 @@ class PlayState extends MusicBeatSubState
     playerStrumline.hitNote(note, !event.isComboBreak);
     if (event.doesNotesplash) playerStrumline.playNoteSplash(note.noteData.getDirection());
     if (note.isHoldNote && note.holdNoteSprite != null) playerStrumline.playNoteHoldCover(note.holdNoteSprite);
-    if (vocals != null) vocals.playerVolume = 1;
+    if (vocals != null) vocals.playerVolume = playerVocalsVolume;
 
     // Display the combo meter and add the calculation to the score.
     if (note.scoreable)
@@ -3225,7 +3269,7 @@ class PlayState extends MusicBeatSubState
     comboPopUps.displayRating(daRating);
     if (combo >= 10) comboPopUps.displayCombo(combo);
 
-    if (vocals != null) vocals.playerVolume = 1;
+    if (vocals != null) vocals.playerVolume = playerVocalsVolume;
   }
 
   /**

source/funkin/ui/debug/charting/ChartEditorState.hx

@@ -6249,6 +6249,12 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
         startTimestamp: startTimestamp,
         playbackRate: playbackRate,
         overrideMusic: true,
+        volume:
+        {
+          inst: (menubarItemVolumeInstrumental.value / 100.0) ?? 1.0,
+          player: (menubarItemVolumeVocalsPlayer.value / 100.0) ?? 1.0,
+          opponent: (menubarItemVolumeVocalsOpponent.value / 100.0) ?? 1.0
+        }
       };
 
     // Override music.