sound effect conversions, minor script tweaks

game/script/1.first-two-days-anon-meets-fang.rpy

@@ -2983,8 +2983,9 @@ label chapter_1:
     window auto
     pause 0.75
 
-    stop music fadeout 0.69
+    $ renpy.music.set_volume(0.0, 0.5, 'music')
-    play sound 'audio/effects/spearYellRumbleTinnitusProlongVoice.ogg' # TODO: volume boost, renpy volume controls cause this to clip horribly for values over 1.0
+    play audio 'audio/effects/spearYellRumbleVoice.ogg'
+    play sound [ "<silence .636>", 'audio/effects/spearYellRumbleTinnitusProlongVoice.ogg'] # TODO: volume boost, renpy volume controls cause this to clip horribly for values over 1.0
 
     window show Dissolve(0.0001)
     Sp "{b}NAOMI!!{/b}" with vpunch
@@ -3025,8 +3026,9 @@ label chapter_1:
 
     pause 0.5
 
-    stop sound fadeout 1
+    stop audio fadeout 2
-    play music 'audio/OST/we just turned on the microphone in our programmers_ house.ogg' fadein 2
+    stop sound fadeout 2
+    $ renpy.music.set_volume(1.0, 2, 'music')
 
     Sp "-dismissed Naomi."
 

game/script/13A.fang-loses-it-after-losing-prom-queen.rpy

@@ -1378,9 +1378,10 @@ label chapter_13A:
     window auto
     pause 0.25
 
-    play sound 'audio/effects/showerDoor.ogg'
+    play sound 'audio/effects/showerStart.ogg'
-
+    pause 1.266
-    pause 2.25
+    stop sound fadeout 0.3
+    pause 0.75
 
     play ambient 'audio/effects/showermuffledloop.ogg' fadein 1.5 volume 0.5
     pause 1
@@ -1429,7 +1430,8 @@ label chapter_13A:
     window auto
     pause .5
 
-    scene roomthrash1 at Pan((0, 610),(0, 0), 30.0) with fade
+    scene roomthrash1 at Pan((0, 610),(0, 0), 30.0) with Dissolve(1):
+        subpixel True
     pause .5
 
     "Fang plops down next to me, the shirt's hem falling down to barely cover her thighs and lack of shorts I could give her."

game/script/14A.KO_OP-ending.rpy

@@ -1186,30 +1186,21 @@ label chapter_14A:
     window auto
     pause 1
 
-    $ renpy.music.set_volume(0, 3, 'ambient1')
+    stop ambient1 fadeout 4
     scene shooterroof:
         size(1920,1080)
         #xanchor 0.5 yanchor 0.5 xpos 0.5 ypos 0.5
         #zoom 1.12
     with Dissolve(3)
 
-    play ambient 'audio/effects/windShooterLoop.ogg' volume 0.2 fadein 2
-    $ renpy.music.set_volume(1, 1.5, 'ambient1')
     pause 0.5
 
     #"She jumps."
     #pause .5
 
     play sound 'audio/effects/shooterFangJumps.ogg' volume 0.7
+    pause 7
 
-    $ renpy.music.set_volume(0, 0.6, 'ambient1')
-    $ renpy.music.set_volume(0, 0.6, 'ambient')
-    pause 6
-
-    stop ambient
-    stop ambient1
-    $ renpy.music.set_volume(1, 0, 'ambient1')
-    $ renpy.music.set_volume(1, 0, 'ambient')
 
     "I can’t look over."
     pause .5
@@ -1333,7 +1324,7 @@ label chapter_14A:
     window auto
     pause 0.5
 
-    play ambient "audio/effects/windShooterLoop.ogg" fadein 5
+    play ambient "audio/effects/windShooterLoop.ogg" fadein 10
     $ renpy.music.set_volume(0.3, 4, 'ambient')
     scene a14 with Dissolve(2)
     pause 2
@@ -1437,10 +1428,10 @@ label chapter_14A:
     stop ambient fadeout 25
     $ renpy.music.set_volume(0, 25, 'ambient')
 
-    pause 7
+    pause 5
 
 
-    scene black with Dissolve(10.0)
+    scene black with Dissolve(9.0)
     pause 2.5
     play music "audio/OST/Sad!.ogg" fadein 15.0 volume 2.8 noloop
     scene e1of4 with Dissolve(9.0)

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

@@ -1264,6 +1264,7 @@ label chapter_8:
         camera:
             perspective True
             linear 0.2 zoom 1.0 xpos 0 ypos 0
+            perspective False
         with None
 
         scene fangroom