fix the rest of the mod menu not having button sounds

Reviewed-on: #257
Reviewed-by: Mappening <mapanon@noreply.git.cavemanon.xyz>

.woodpecker.yml

@@ -83,6 +83,6 @@ steps:
 
 matrix:
   RenpyVersion:
-    - "8.3.2"
+    - "8.3.3"
   RenkitVersion:
     - "4.4.0"

game/script/8.anon-and-fang-study-together.rpy

@@ -718,7 +718,7 @@ label chapter_8:
         pause .5
 
         "{cps=*0.5}AAAAAAAAAAAAAAAA{/cps}"
-        play music 'audio/OST/Dragging on and on....ogg' fadein 1.0
+        play music 'audio/OST/Dragging on and on....ogg' fadein 1.0 volume 0.5
         pause .5
 
         F "Anon, are you paying attention?"
@@ -732,15 +732,31 @@ label chapter_8:
         pause .5
 
         F "Alright, try these chords."
-        play sound 'audio/effects/goodA.ogg' fadein 0.5
+
+        # Renpy's audio is rarted, do this workaround instead
+        $ renpy.music.set_volume(1.0, 0.0, 'sound')
+        play sound 'audio/effects/goodA.ogg'
+        $ renpy.music.set_volume(0.0, 1.5, 'sound')
+        pause 0.25
+    
         "Her fingers press mine down, holding down the strings in an awkward position."
 
         F "Then this."
-        play sound 'audio/effects/goodB.ogg' fadein 0.5
+
+        $ renpy.music.set_volume(1.0, 0.0, 'sound')
+        play sound 'audio/effects/goodB.ogg'
+        $ renpy.music.set_volume(0.0, 1.5, 'sound')
+        pause 0.25
+
         "My hands are slid down closer to the base of the neck and too close to my crotch."
 
         F "And then finally this."
-        play sound 'audio/effects/goodC.ogg' fadein 0.5
+
+        $ renpy.music.set_volume(1.0, 0.0, 'sound')
+        play sound 'audio/effects/goodC.ogg'
+        $ renpy.music.set_volume(0.0, 1.5, 'sound')
+        pause 0.25
+
         "My fingers are shifted back up to the middle of the fretboard."
 
         F "Try that out, Anon."
@@ -749,14 +765,25 @@ label chapter_8:
         "Fang let’s go of my sweaty hands. She doesn’t move from behind me though."
 
         "I try and replicate the movements."
-        pause .5
-        play sound 'audio/effects/goodA.ogg' fadein 0.5
+
+        $ renpy.music.set_volume(1.0, 0.0, 'sound')
+        play sound 'audio/effects/goodA.ogg'
+        $ renpy.music.set_volume(0.0, 1.5, 'sound')
+        pause 0.25
 
         "The first strum sounds… not bad…"
-        play sound 'audio/effects/badA.ogg' fadein 0.5
+
+        $ renpy.music.set_volume(1.0, 0.0, 'sound')
+        play sound 'audio/effects/badA.ogg'
+        $ renpy.music.set_volume(0.0, 1.5, 'sound')
+        pause 0.25
 
         "The second note is horrendous. I blame my pants."
-        play sound 'audio/effects/goodC.ogg' fadein 0.5
+
+        $ renpy.music.set_volume(1.0, 0.0, 'sound')
+        play sound 'audio/effects/goodC.ogg'
+        $ renpy.music.set_volume(0.0, 1.5, 'sound')
+        pause 0.25
 
         "And the last chord comes out alrightish."
         pause .5
@@ -792,6 +819,8 @@ label chapter_8:
         "My pinky slides off the fretboard and when I strum again a strange look appears in Fang’s eyes."
         window hide
         window auto
+
+        $ renpy.music.set_volume(1.0, 0.5, 'sound')
         pause .5
 
         label musicalchoices:

game/src/chapter_select.rpy

@@ -77,6 +77,15 @@ label chapter_select_go_back:
         ending_chapters_determined = False
         current_chapter = chapter_list[chapter_list_index]
 
+        renpy.music.set_volume(1.0, 0.0, 'sound')
+        renpy.music.set_volume(1.0, 0.0, 'music')
+        renpy.music.set_volume(1.0, 0.0, 'music1')
+        renpy.music.set_volume(1.0, 0.0, 'music2')
+        renpy.music.set_volume(1.0, 0.0, 'ambient')
+        renpy.music.set_volume(1.0, 0.0, 'ambient1')
+        renpy.music.set_volume(1.0, 0.0, 'ambient2')
+        renpy.music.set_volume(1.0, 0.0, 'ambient3')
+
     menu:
         "What ending do you want to lock to?"
 

game/src/mod_menu.rpy

@@ -690,7 +690,6 @@ screen mod_menu():
     $ main_menu_button_img = "gui/button/menubuttons/template_idle_epilogue.png" if persistent.use_epilogue_menu else "gui/button/menubuttons/template_idle.png"
 
     default mod_metadata = {}
-    default reload_game = False
     default mod_button_enabled = True
     default mod_button_alpha = 1.0
     default mod_screenshot_list = None
@@ -705,14 +704,7 @@ screen mod_menu():
 
         spacing 8
 
-        use mod_menu_top_buttons(main_menu_button_img, _("Reload Mods"), SetScreenVariable("reload_game", True)):
-        # For some reason, Function() will instantly reload the game upon entering the mod menu, and put it in an infinite loop, so doing this python jank
-        # is the only way
-            if reload_game:
-                python:
-                    reload_game = False
-                    persistent.reloading_mods = True
-                    renpy.reload_script()
+        use mod_menu_top_buttons(main_menu_button_img, _("Reload Mods"), Function(reload_game))
         use mod_menu_top_buttons(main_menu_button_img, _("Return"), ShowMenu("extras"))
 
     viewport:
@@ -752,7 +744,7 @@ screen mod_menu():
                                     style_prefix "main_menu"
                                     add Null(30,30)
 
-                                    activate_sound "audio/ui/snd_ui_click.wav"
+                                    activate_sound "audio/ui/uiClick.wav"
 
                                     if persistent.use_epilogue_menu:
                                         idle_foreground Transform("gui/button/menubuttons/up.png",xalign=0.5,yalign=0.5,matrixcolor=TintMatrix("#000000"))
@@ -779,7 +771,7 @@ screen mod_menu():
 
                                 if x["Scripts"]:
                                     action Function(toggle_persistent_mods, i)
-                                    activate_sound "audio/ui/snd_ui_click.wav"
+                                    activate_sound "audio/ui/uiClick.wav"
                                     if persistent.enabled_mods[i][1]:
                                         idle_foreground Transform("gui/button/menubuttons/check.png",xalign=0.5,yalign=0.5,matrixcolor=TintMatrix("#00ff40"))
                                         hover_foreground Transform("gui/button/menubuttons/check.png",xalign=0.5,yalign=0.5,matrixcolor=TintMatrix("#ffffff"))
@@ -795,7 +787,7 @@ screen mod_menu():
                                     style_prefix "main_menu"
                                     add Null(30,30)
                                     action Function(swapMods, i, i+1)
-                                    activate_sound "audio/ui/snd_ui_click.wav"
+                                    activate_sound "audio/ui/uiClick.wav"
 
                                     if persistent.use_epilogue_menu:
                                         idle_foreground Transform("gui/button/menubuttons/down.png",xalign=0.5,yalign=0.5,matrixcolor=TintMatrix("#000000"))
@@ -822,7 +814,7 @@ screen mod_menu():
                             at transform:
                                 truecenter
                                 alpha mod_button_alpha
-                            activate_sound "audio/ui/snd_ui_click.wav"
+                            activate_sound "audio/ui/uiClick.wav"
                             hovered SetScreenVariable("mod_metadata", x)
 
                             # Clicking the mod button starts the mod on PC, but we have to click a seperate button to start on Android.
@@ -872,7 +864,7 @@ screen mod_menu():
                                 ysize 160
                         button:
                             at truecenter
-                            activate_sound "audio/ui/snd_ui_click.wav"
+                            activate_sound "audio/ui/uiClick.wav"
                             action Start(x["Label"])
 
                             frame:
@@ -1041,7 +1033,7 @@ screen mod_menu():
 
                             text _("Show Errors") xalign 0.5 yalign 0.5 size 50 outlines [ (absolute(1), "#000", absolute(0), absolute(0)) ]
                         action SetScreenVariable("mod_metadata", {})
-                        activate_sound "audio/ui/snd_ui_click.wav"
+                        activate_sound "audio/ui/uiClick.wav"
 
                 if mod_metadata.get("Label") != None:
                     $ mod_button_alpha = 1.0 if mod_metadata["Enabled"] == True else 0.4 # Fade mod button out if mod is disabled
@@ -1059,7 +1051,7 @@ screen mod_menu():
 
                             text _("Start") xalign 0.5 yalign 0.5 size 50 outlines [ (absolute(1), "#000", absolute(0), absolute(0)) ]
                         action Start(mod_metadata["Label"])
-                        activate_sound "audio/ui/snd_ui_click.wav"
+                        activate_sound "audio/ui/uiClick.wav"
 
 
     if not persistent.seenModWarning:
@@ -1090,6 +1082,11 @@ screen mod_menu_top_buttons(image, text, action):
             text text xalign 0.5 yalign 0.5 size 34
 
         action action
-        activate_sound "audio/ui/snd_ui_click.wav"
+        activate_sound "audio/ui/uiClick.wav"
 
-        transclude  
+        transclude  
+
+init python:
+    def reload_game():
+        persistent.reloading_mods = True
+        renpy.reload_script()

renconstruct.toml

@@ -22,5 +22,5 @@
   clear_output_dir = false # whether to clear the output directory on startup
 
 [renutil]
-  version = "8.3.2" # the Ren'Py version to use (required)
+  version = "8.3.3" # the Ren'Py version to use (required)
   registry = "/tmp/cache" # the directory to store installation files in