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

@@ -124,10 +124,10 @@ class Save implements ConsoleClass
           zoomCamera: true,
           debugDisplay: 'Off',
           debugDisplayBGOpacity: 50,
-          subtitles: true,
           hapticsMode: 'All',
           hapticsIntensityMultiplier: 1,
           autoPause: true,
+          videoSubtitles: true,
           vsyncMode: 'Off',
           strumlineBackgroundOpacity: 0,
           autoFullscreen: false,
@@ -379,23 +379,6 @@ class Save implements ConsoleClass
     return data.optionsChartEditor.showNoteKinds;
   }
 
-  public var chartEditorShowSubtitles(get, set):Bool;
-
-  function get_chartEditorShowSubtitles():Bool
-  {
-    if (data.optionsChartEditor.showSubtitles == null) data.optionsChartEditor.showSubtitles = true;
-
-    return data.optionsChartEditor.showSubtitles;
-  }
-
-  function set_chartEditorShowSubtitles(value:Bool):Bool
-  {
-    // Set and apply.
-    data.optionsChartEditor.showSubtitles = value;
-    flush();
-    return data.optionsChartEditor.showSubtitles;
-  }
-
   public var chartEditorPlaytestStartTime(get, set):Bool;
 
   function get_chartEditorPlaytestStartTime():Bool
@@ -1635,12 +1618,6 @@ typedef SaveDataOptions =
    */
   var debugDisplayBGOpacity:Int;
 
-  /**
-   * If enabled, subtitles will appear.
-   * @default `true`
-   */
-  var subtitles:Bool;
-
   /**
    * If enabled, haptic feedback will be enabled.
    * @default `All`
@@ -1659,6 +1636,12 @@ typedef SaveDataOptions =
    */
   var autoPause:Bool;
 
+  /**
+   * If enabled, subtitles will be shown on video cutscenes.
+   * @default `true`
+   */
+  var videoSubtitles:Bool;
+
   /**
    * If enabled, the game will utilize VSync (or adaptive VSync) on startup.
    * @default `Off`
@@ -1903,12 +1886,6 @@ typedef SaveDataChartEditorOptions =
    */
   var ?showNoteKinds:Bool;
 
-  /**
-   * Show Subtitles in the Chart Editor.
-   * @default `true`
-   */
-  var ?showSubtitles:Bool;
-
   /**
    * Metronome volume in the Chart Editor.
    * @default `1.0`

source/funkin/ui/options/PreferencesMenu.hx

@@ -109,20 +109,20 @@ class PreferencesMenu extends Page<OptionsState.OptionsMenuPageName>
   function createPrefItems():Void
   {
     #if FEATURE_NAUGHTYNESS
-    createPrefItemCheckbox('Naughtyness', 'When enabled, raunchy content (such as swearing, etc.) is displayed.', function(value:Bool):Void {
+    createPrefItemCheckbox('Naughtyness', 'If enabled, raunchy content (such as swearing, etc.) will be displayed.', function(value:Bool):Void {
       Preferences.naughtyness = value;
     }, Preferences.naughtyness);
     #end
-    createPrefItemCheckbox('Downscroll', 'When enabled, notes move downwards toward the strumline at the bottom of the screen.', function(value:Bool):Void {
+    createPrefItemCheckbox('Downscroll', 'If enabled, this will make the notes move downwards.', function(value:Bool):Void {
       Preferences.downscroll = value;
     },
       Preferences.downscroll, #if mobile ControlsHandler.hasExternalInputDevice
       || Preferences.controlsScheme != FunkinHitboxControlSchemes.Arrows #end);
-    createPrefItemPercentage('Strumline Background', 'Show a semi-transparent background behind the strumline.', function(value:Int):Void {
+    createPrefItemPercentage('Strumline Background', 'Give the strumline a semi-transparent background', function(value:Int):Void {
       Preferences.strumlineBackgroundOpacity = value;
     }, Preferences.strumlineBackgroundOpacity);
     #if FEATURE_HAPTICS
-    createPrefItemEnum('Haptics', 'When enabled, the game plays haptic feedback effects.', [
+    createPrefItemEnum('Haptics', 'If enabled, game will use haptic feedback effects.', [
       "All" => HapticsMode.ALL,
       "Notes Only" => HapticsMode.NOTES_ONLY,
       "None" => HapticsMode.NONE,
@@ -134,51 +134,52 @@ class PreferencesMenu extends Page<OptionsState.OptionsMenuPageName>
         case HapticsMode.NONE: "None";
         default: "All";
       });
-    createPrefItemNumber('Haptics Intensity', 'Intensity multiplier for all haptic feedback effects.', function(value:Float) {
+    createPrefItemNumber('Haptics Intensity', 'Multiplier of intensity for all the haptic feedback effects.', function(value:Float) {
       Preferences.hapticsIntensityMultiplier = value;
     }, null, Preferences.hapticsIntensityMultiplier, 0.1, 5, 0.1, 1);
     #end
-    createPrefItemCheckbox('Flashing Lights', 'When disabled, flashing effects are dampened. Useful for people with photosensitive epilepsy.',
+    createPrefItemCheckbox('Flashing Lights', 'If disabled, it will dampen flashing effects. Useful for people with photosensitive epilepsy.',
       function(value:Bool):Void {
         Preferences.flashingLights = value;
       }, Preferences.flashingLights);
-    createPrefItemCheckbox('Camera Zooms', 'When enabled, the camera bounces during songs.', function(value:Bool):Void {
+    createPrefItemCheckbox('Camera Zooms', 'If disabled, camera stops bouncing to the song.', function(value:Bool):Void {
       Preferences.zoomCamera = value;
     }, Preferences.zoomCamera);
-    createPrefItemCheckbox('Subtitles', 'When enabled, subtitles appear during some songs and cutscenes.', function(value:Bool):Void {
-      Preferences.subtitles = value;
-    }, Preferences.subtitles);
-    #if FEATURE_DEBUG_DISPLAY
+    #if FEATURE_VIDEO_SUBTITLES
+    createPrefItemCheckbox('Video Subtitles', 'If enabled, subtitles will be shown on video cutscenes.', function(value:Bool):Void {
+      Preferences.videoSubtitles = value;
+    }, Preferences.videoSubtitles);
+    #end
+    #if !mobile
     // note: technically we can do DebugDisplayMode.Advanced => DebugDisplayMode.Advanced, etc. here, but that's a bit headache inducing.
-    createPrefItemEnum('Debug Display', 'When enabled, FPS and other debug stats are displayed.', [
+    createPrefItemEnum('Debug Display', 'If enabled, FPS and other debug stats will be displayed.', [
       "Advanced" => DebugDisplayMode.Advanced,
       "Simple" => DebugDisplayMode.Simple,
       "Off" => DebugDisplayMode.Off
     ], (key:String, value:DebugDisplayMode) -> {
       Preferences.debugDisplay = value;
     }, Preferences.debugDisplay);
-    createPrefItemPercentage('Debug Display BG', "Adjust the debug display's background opacity.", function(value:Int):Void {
+
+    createPrefItemPercentage('Debug Display BG', "Change debug display's background opacity", function(value:Int):Void {
       Preferences.debugDisplayBGOpacity = value;
     }, Preferences.debugDisplayBGOpacity);
-    #end
-    #if !mobile
-    createPrefItemCheckbox('Pause on Unfocus', 'When enabled, the game automatically pauses when losing focus.', function(value:Bool):Void {
+    createPrefItemCheckbox('Pause on Unfocus', 'If enabled, game automatically pauses when it loses focus.', function(value:Bool):Void {
       Preferences.autoPause = value;
     }, Preferences.autoPause);
-    createPrefItemCheckbox('Launch in Fullscreen', 'When enabled, the game automatically starts up in fullscreen mode.', function(value:Bool):Void {
+    createPrefItemCheckbox('Launch in Fullscreen', 'Automatically launch the game in fullscreen on startup.', function(value:Bool):Void {
       Preferences.autoFullscreen = value;
     }, Preferences.autoFullscreen);
     #end
 
     #if web
-    createPrefItemCheckbox('Unlocked Framerate', 'When enabled, the framerate is unlocked.', function(value:Bool):Void {
+    createPrefItemCheckbox('Unlocked Framerate', 'If enabled, the framerate will be unlocked.', function(value:Bool):Void {
       Preferences.unlockedFramerate = value;
     }, Preferences.unlockedFramerate);
     #else
     // disabled on macos due to "error: Late swap tearing currently unsupported"
     // disable on mobile since it barely has any effect
     #if !(mac || mobile)
-    createPrefItemEnum('VSync', "When enabled, the game attempts to match the framerate with your monitor's refresh rate.", [
+    createPrefItemEnum('VSync', 'If enabled, game will attempt to match framerate with your monitor.', [
       "Off" => WindowVSyncMode.OFF,
       "On" => WindowVSyncMode.ON,
       "Adaptive" => WindowVSyncMode.ADAPTIVE,
@@ -200,13 +201,13 @@ class PreferencesMenu extends Page<OptionsState.OptionsMenuPageName>
     #end
 
     #if FEATURE_SCREENSHOTS
-    createPrefItemCheckbox('Hide Mouse', 'When enabled, the mouse is hidden while taking a screenshot.', function(value:Bool):Void {
+    createPrefItemCheckbox('Hide Mouse', 'If enabled, the mouse will be hidden when taking a screenshot.', function(value:Bool):Void {
       Preferences.shouldHideMouse = value;
     }, Preferences.shouldHideMouse);
-    createPrefItemCheckbox('Fancy Preview', 'When enabled, a preview is shown after taking a screenshot.', function(value:Bool):Void {
+    createPrefItemCheckbox('Fancy Preview', 'If enabled, a preview will be shown after taking a screenshot.', function(value:Bool):Void {
       Preferences.fancyPreview = value;
     }, Preferences.fancyPreview);
-    createPrefItemCheckbox('Preview on Save', 'When enabled, the preview is only shown after a screenshot is saved.', function(value:Bool):Void {
+    createPrefItemCheckbox('Preview on save', 'If enabled, the preview will be shown only after a screenshot is saved.', function(value:Bool):Void {
       Preferences.previewOnSave = value;
     }, Preferences.previewOnSave);
     #end

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
 
   /**