changes

Author: PurSnake

source/funkin/InitState.hx

@@ -44,10 +44,6 @@ import funkin.api.discord.DiscordClient;
 #if FEATURE_NEWGROUNDS
 import funkin.api.newgrounds.NewgroundsClient;
 #end
-#if FEATURE_LOST_FOCUS_VOLUME
-import flixel.tweens.FlxTween;
-import flixel.tweens.FlxEase;
-#end
 
 /**
  * A core class which performs initialization of the game.
@@ -297,45 +293,18 @@ class InitState extends FlxState
 
   #if FEATURE_LOST_FOCUS_VOLUME
   @:noCompletion var _lastFocusVolume:Null<Float>;
-  @:noCompletion var _lostFocusVolumeTween:Null<FlxTween>;
 
   function onLostFocus()
   {
-    if (FlxG.sound.muted || FlxG.sound.volume == 0 || Preferences.lostVolumeFocusMode == "Off" || FlxG.autoPause) return;
-    _lostFocusVolumeTween?.cancel();
+    if (FlxG.sound.muted || FlxG.sound.volume == 0 || FlxG.autoPause) return;
     _lastFocusVolume = FlxG.sound.volume;
-
-    if (Preferences.lostVolumeFocusMode == "Instant")
-    {
-      FlxG.sound.volume *= Constants.LOST_FOCUS_VOLUME_MULTIPLIER;
-    }
-    else if (Preferences.lostVolumeFocusMode == "Delayed")
-    {
-      _lostFocusVolumeTween = FlxTween.num(FlxG.sound.volume, FlxG.sound.volume * Constants.LOST_FOCUS_VOLUME_MULTIPLIER, Constants.LOST_FOCUS_VOLUME_DURATION,
-        {
-          startDelay: Constants.LOST_FOCUS_VOLUME_DELAY,
-          ease: FlxEase.smootherStepOut
-        }, (volume:Float) -> FlxG.sound.volume = volume);
-    }
+    FlxG.sound.volume *= Constants.LOST_FOCUS_VOLUME_MULTIPLIER;
   }
 
   function onGainFocus()
   {
-    if (FlxG.sound.muted || Preferences.lostVolumeFocusMode == "Off" || FlxG.autoPause) return;
-    _lostFocusVolumeTween?.cancel();
-
-    if (_lastFocusVolume != null)
-    {
-      if (Preferences.lostVolumeFocusMode == "Instant")
-      {
-        FlxG.sound.volume = _lastFocusVolume;
-      }
-      else if (Preferences.lostVolumeFocusMode == "Delayed")
-      {
-        _lostFocusVolumeTween = FlxTween.num(FlxG.sound.volume, _lastFocusVolume, Math.max(0.15, FlxG.sound.volume / _lastFocusVolume * .5),
-          {ease: FlxEase.smootherStepInOut}, (volume:Float) -> FlxG.sound.volume = volume);
-      }
-    }
+    if (FlxG.sound.muted || FlxG.autoPause) return;
+    if (_lastFocusVolume != null) FlxG.sound.volume = _lastFocusVolume;
   }
   #end
 

source/funkin/save/Save.hx

@@ -127,7 +127,6 @@ class Save implements ConsoleClass
           hapticsMode: 'All',
           hapticsIntensityMultiplier: 1,
           autoPause: true,
-          lostVolumeFocusMode: "Delayed",
           videoSubtitles: true,
           vsyncMode: 'Off',
           strumlineBackgroundOpacity: 0,
@@ -1637,12 +1636,6 @@ typedef SaveDataOptions =
    */
   var autoPause:Bool;
 
-  /**
-   * How game should react with volume to losing application focus.
-   * @default `Delayed`
-   */
-  var lostVolumeFocusMode:String;
-
   /**
    * If enabled, subtitles will be shown on video cutscenes.
    * @default `true`

source/funkin/ui/options/PreferencesMenu.hx

@@ -160,13 +160,6 @@ class PreferencesMenu extends Page<OptionsState.OptionsMenuPageName>
       Preferences.debugDisplay = value;
     }, Preferences.debugDisplay);
 
-    #if FEATURE_LOST_FOCUS_VOLUME
-    createPrefItemEnum('Focus Volume Mode', 'If enabled, game will reduce its volume when unfocused.',
-      ["Delayed" => "Delayed", "Instant" => "Instant", "Off" => "Off"], (key:String, value:String) -> {
-        Preferences.lostVolumeFocusMode = value;
-      }, Preferences.lostVolumeFocusMode);
-    #end
-
     createPrefItemPercentage('Debug Display BG', "Change debug display's background opacity", function(value:Int):Void {
       Preferences.debugDisplayBGOpacity = value;
     }, Preferences.debugDisplayBGOpacity);

source/funkin/util/Constants.hx

@@ -574,17 +574,7 @@ class Constants
   /**
    * How much volume should be reduced on Application Focus Lost.
    */
-  public static final LOST_FOCUS_VOLUME_MULTIPLIER:Float = 0.1;
-
-  /**
-   * Duration, in seconds, how long should volume reduce.
-   */
-  public static final LOST_FOCUS_VOLUME_DURATION:Float = 0.85;
-
-  /**
-   * Delay how long should game wait before fading volume with `Delayed` volume fade option.
-   */
-  public static final LOST_FOCUS_VOLUME_DELAY:Float = 0.15;
+  public static final LOST_FOCUS_VOLUME_MULTIPLIER:Float = 0.5;
   #end
 
   /**