Map's audio updates for chapter 2

game/script/2.fourth-day-of-school.rpy

@@ -10,7 +10,7 @@ label chapter_2:
     I "You know the drill."
 
     I "Combat roll,{w=.3}{nw}"
-    play sound "<from 0.2 to 2.0>audio/effects/Slam.ogg" volume 1.8
+    play sound "audio/effects/anonHeadbutt.ogg"
     I "Combat roll,{fast} head butt,{w=.3} victory screech." with vpunch
 
     I "Breakfast,{w=.3} shitposting,{w=.3} clothes."
@@ -407,7 +407,7 @@ label chapter_2:
 
     I "But it is relieving that she didn’t recognize me.{w=.5} Guess Naser didn’t tell her."
 
-    stop music fadeout 0.5
+    stop music fadeout 0.69
     play sound 'audio/effects/schoolBell.ogg'
     pause 2
 
@@ -508,8 +508,8 @@ label chapter_2:
     #--not brazil, Forced text speedup through the following 4 lines
 
     show dimmer_darker behind anon, fang with Fade(.1, 0, .25, color="#fff")
-    play ambient "audio/effects/alarmSirenLoop.ogg" fadein 0.2
     play sound 'audio/effects/slapstickPunch.ogg'
+    play ambient "audio/effects/alarmSirenLoop.ogg"
     I "{cps=*2}SPAGHETTI ALERT!!{w=0.6} SPAGHETTI ALERT!!{/cps}" with vpunch
 
     I "{cps=*2}DEFCON LEVEL TWO{/cps}"
@@ -528,12 +528,15 @@ label chapter_2:
 
     A "Thanks,{w=0.4} you too."
 
-    play ambient "audio/effects/alarmSirenLoop.ogg" fadein 0.2
+    play ambient "audio/effects/alarmSirenLoop.ogg" fadein 0.69
+    pause .1
+    # This was the best I could come up with. Not ideal, but it feels the most immediate given the limitation
     show dimmer_darker behind anon, fang with Dissolve(0.1)
 
     I "SHIT!{w=.6} RECOVERY MANEUVERS NOW!"
 
-    stop ambient fadeout 0.5
+    stop ambient fadeout 0.69
+
     hide dimmer_darker with dissolve
     pause .5
 
@@ -670,7 +673,7 @@ label chapter_2:
 
     F "{cps=*.3}I’LL HAVE YOU KNOW-{/cps}{w=0.25}{nw}"
 
-    stop music fadeout 0.75
+    stop music fadeout 0.1
     play sound 'audio/effects/slapstickSuperPunch.ogg'
     
     # fuk u renpy, let me do more than one goddamn thing at once without resorting to this hacky bullshit
@@ -734,13 +737,13 @@ label chapter_2:
 
     I "She was already upset about something before{cps=*.1}...{/cps}"
 
+    stop ambient fadeout 1
     scene black with fade
 
     I "She was upset before because of the concert the other day?"
 
     I "Looks like I just pushed her over the edge."
 
-    stop ambient fadeout 1
     play music 'audio/OST/Appreciating the Atmosphere.ogg' fadein 1
     scene science class
     show anon neutral:
@@ -970,7 +973,7 @@ label chapter_2:
     pause .15
     hide anon with Dissolve(.25)
 
-    play sound "<from 0.2 to 2.0>audio/effects/Slam.ogg" volume 1.4
+    play sound "audio/effects/anonDeskSlam.ogg"
     with vpunch
 
     I "Luckily I fell sideways and there was a cold hard desk in the way to catch my fall."
@@ -1136,7 +1139,7 @@ label chapter_2:
     T "What about you?{w=.4} Now you tell us about yourself."
     pause .5
 
-    stop music fadeout 0.75
+    $ renpy.music.set_volume(0, 0.75, 'music')
     # play sound 'audio/effects/alarmPoliceSiren.ogg'
     play sound 'audio/effects/alarmPoliceSiren.ogg'
     show dimmer_light behind anon, reed, trish:
@@ -1150,7 +1153,7 @@ label chapter_2:
 
     I "And if they find out where I was a few days ago{cps=*.1}...{/cps}"
 
-    play music 'audio/OST/Those Other Two Weirdos.ogg' fadein 1.5
+    $ renpy.music.set_volume(1, 1.5, 'music')
     hide dimmer_light with dissolve
 
     A "Uhh{cps=*.1}...{/cps}{w=.2} I’m Anon and I’m a human.{w=.4} I got here Monday."
@@ -1301,11 +1304,15 @@ label chapter_2:
     show reed neutral flip with Dissolve(.25)
     pause .25
 
-    play sound 'audio/effects/bell.ogg'
+    play sound 'audio/effects/schoolBell.ogg'
+    stop music
     pause 2
 
     I "The bell announces lunchtime,{w=.4} and the rest of the students collectively rise and start shuffling out the door."
 
+    play music 'audio/OST/Those Other Two Weirdos.ogg' fadein 1 
+    stop sound fadeout 1.0
+
     A "Lunch hour,{w=.4} been a blast talking to you guys."
 
     show anon:
@@ -1361,6 +1368,7 @@ label chapter_2:
     I "What should have been my lunch card,{w=.3} binders,{w=.3} and {cps=*.25}horrendously{/cps} embarrassing art book{cps=*.1}...{/cps}"
 
     show dimmer_light with dissolve
+    stop ambient fadeout 1
     play music 'audio/OST/Fuck You I Like To Ignore Problems.ogg'
 
     I "Was instead a half dozen glass flasks,{w=.4} bags full of{cps=*.1}...{/cps}{w=.5} something,{w=.5} and all sorts of machinery I didn’t recognize."
@@ -1426,6 +1434,7 @@ label chapter_2:
     pause .5
 
     stop music fadeout 3.5
+    play ambient 'audio/effects/teenageCafeteriaLoop.ogg' fadein 3.5
     play sound 'audio/effects/slapstickBigPunch.ogg'
     show reed shocked
     A "REED!" with vpunch
@@ -1472,7 +1481,7 @@ label chapter_2:
     pause .5
 
     # TODO: this music plays for a long time, mix it up with something else?
-    stop ambient fadeout 1
+    stop ambient fadeout 1.0
     play music 'audio/OST/Fuck You I Like To Shitpost.ogg'
 
     A "{cps=*.25}Thank fuck...{/cps}"
@@ -1910,7 +1919,7 @@ label chapter_2:
     F "We should hurry and pick one."
 
     stop music fadeout 3
-    play ambient 'audio/effects/school loop.ogg' fadein 2
+    play ambient 'audio/effects/teenageCafeteriaLoop.ogg' fadein 2
     scene black with fade
 
     # TODO: are the gang in the lunch queue, or is this after? This line conflicts with subsequent dialogue
@@ -1995,7 +2004,9 @@ label chapter_2:
             pass
     
     pause .5
-    stop music fadeout .1
+
+    $ renpy.music.set_volume(0, 0.1, 'ambient')
+    $ renpy.music.set_volume(0, 0.1, 'music')
 
     show reed shocked flip:
        easein 0.5 xalign 0.54
@@ -2013,7 +2024,9 @@ label chapter_2:
     show fang neutral flip with Dissolve(.25)
     F "How could you tell?"
 
-    stop ambient fadeout 1
+    stop ambient
+    $ renpy.music.set_volume(1, 0, 'ambient')
+    $ renpy.music.set_volume(1, 0, 'music')
     play music 'audio/OST/Bayside Bumming it.ogg'
 
     show trish neutral flip
@@ -2077,7 +2090,7 @@ label chapter_2:
     pause .5
     play sound 'audio/effects/whoosh.ogg'
     stop music fadeout 3
-    play ambient 'audio/effects/school loop.ogg' fadein 3
+    play ambient 'audio/effects/teenageCafeteriaLoop.ogg' fadein 3
     show trish:
         easeout 0.4 xalign 2.2
     hide trish with dissolve
@@ -2256,6 +2269,7 @@ label chapter_2:
     I "I’m free."
     pause .5
 
+    stop sound fadeout 1.0
     play music 'audio/OST/Dragging on and on....ogg' fadein 1
     show naser neutral with Dissolve(.25)