From 76129355470110682cff41a86c6aebcd827118c4 Mon Sep 17 00:00:00 2001
From: Map <mapmappening@gmail.com>
Date: Mon, 7 Oct 2024 00:51:56 -0500
Subject: [PATCH] turn on linear fades to prevent mixing from getting out of
 wack and fucking fix those volume defaults once and for all

---
 game/options.rpy | 10 ++++++++--
 game/screens.rpy |  8 ++++----
 game/script.rpy  |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/game/options.rpy b/game/options.rpy
index c4c0efc..f8d0d28 100644
--- a/game/options.rpy
+++ b/game/options.rpy
@@ -135,9 +135,15 @@ default preferences.afm_time = 15
 
 
 ## Disables loading all languages at once at startup, only loading a language when selecting a language
+
 define config.defer_tl_scripts = True
 
 
+## Retains linear audio fading so mixing doesn't get fucked from the update to 8.2+
+
+define config.linear_fades = True
+
+
 ## Snoot-specific config variables
 
 define config.developer = "auto"
@@ -163,8 +169,8 @@ init python:
 
 ##Default Audio is not ear rape
 define config.default_music_volume = 0.48
-define config.default_sfx_volume = 0.80
-define config.default_voice_volume = 0.80
+define config.default_sfx_volume = 0.8
+define config.default_voice_volume = 0.8
 
 ## Save directory ##############################################################
 ##
diff --git a/game/screens.rpy b/game/screens.rpy
index ee5e92e..f1ba2e8 100644
--- a/game/screens.rpy
+++ b/game/screens.rpy
@@ -975,7 +975,7 @@ screen preferences():
                         hbox:
                             bar value Preference("music volume") yalign 0.5
                             textbutton _("Reset"):
-                                action Function(preferences.set_volume, 'music', config.default_music_volume)
+                                action Function(preferences.set_mixer, 'music', config.default_music_volume)
 
                     if config.has_sound:
 
@@ -983,7 +983,7 @@ screen preferences():
                         hbox:
                             bar value Preference("sfx volume") yalign 0.5
                             textbutton _("Reset"):
-                                action Function(preferences.set_volume, 'sfx', config.default_sfx_volume)
+                                action Function(preferences.set_mixer, 'sfx', config.default_sfx_volume)
                             if config.sample_sound:
                                 textbutton _("Test") action Play("sound", config.sample_sound)
 
@@ -992,7 +992,7 @@ screen preferences():
                             bar value Preference("ui volume") yalign 0.5
                             textbutton _("Reset"):
                                 yalign 0.5
-                                action Function(preferences.set_volume, 'ui', config.default_sfx_volume)
+                                action Function(preferences.set_mixer, 'ui', config.default_sfx_volume)
 
                     if config.has_voice:
                         label _("Voice Volume")
@@ -1000,7 +1000,7 @@ screen preferences():
                             bar value Preference("voice volume") yalign 0.5
                             textbutton _("Reset"):
                                 yalign 0.5
-                                action Function(preferences.set_volume, 'voice', config.default_sfx_volume)
+                                action Function(preferences.set_mixer, 'voice', config.default_voice_volume)
                             if config.sample_voice:
                                 textbutton _("Test") action Play("voice", config.sample_voice)
 
diff --git a/game/script.rpy b/game/script.rpy
index bb8024f..b195746 100644
--- a/game/script.rpy
+++ b/game/script.rpy
@@ -60,7 +60,7 @@ label before_main_menu:
     # Call initial language setup screen
     # languaged_up is set within lang_sel
     if (persistent.languaged_up is None):
-        $ preferences.set_volume('ui', config.default_sfx_volume) # stank fucking workaround to fix a bug
+        $ preferences.set_mixer("ui", config.default_sfx_volume)
         call screen lang_sel
     return