diff --git a/game/audio/effects/alarmAirraidSiren.ogg b/game/audio/effects/alarmAirraidSiren.ogg index 1685615b..abc5b054 100644 Binary files a/game/audio/effects/alarmAirraidSiren.ogg and b/game/audio/effects/alarmAirraidSiren.ogg differ diff --git a/game/audio/effects/alarmClock.ogg b/game/audio/effects/alarmClock.ogg index 6f4ed823..ee5f5c0a 100644 Binary files a/game/audio/effects/alarmClock.ogg and b/game/audio/effects/alarmClock.ogg differ diff --git a/game/audio/effects/alarmPoliceSiren.ogg b/game/audio/effects/alarmPoliceSiren.ogg index 0a7f8aa4..6538f20b 100644 Binary files a/game/audio/effects/alarmPoliceSiren.ogg and b/game/audio/effects/alarmPoliceSiren.ogg differ diff --git a/game/audio/effects/anonBedRustle.ogg b/game/audio/effects/anonBedRustle.ogg index d780e5e7..6550a424 100644 Binary files a/game/audio/effects/anonBedRustle.ogg and b/game/audio/effects/anonBedRustle.ogg differ diff --git a/game/audio/effects/anonDeskSlam.ogg b/game/audio/effects/anonDeskSlam.ogg index 836ef757..ccf8bc36 100644 Binary files a/game/audio/effects/anonDeskSlam.ogg and b/game/audio/effects/anonDeskSlam.ogg differ diff --git a/game/audio/effects/anonDink.ogg b/game/audio/effects/anonDink.ogg index aac06c26..fc46d6ec 100644 Binary files a/game/audio/effects/anonDink.ogg and b/game/audio/effects/anonDink.ogg differ diff --git a/game/audio/effects/anonDumbassFall.ogg b/game/audio/effects/anonDumbassFall.ogg index 1c8beb44..28db2841 100644 Binary files a/game/audio/effects/anonDumbassFall.ogg and b/game/audio/effects/anonDumbassFall.ogg differ diff --git a/game/audio/effects/anonGardenFall.ogg b/game/audio/effects/anonGardenFall.ogg index 7c542a0c..d1548878 100644 Binary files a/game/audio/effects/anonGardenFall.ogg and b/game/audio/effects/anonGardenFall.ogg differ diff --git a/game/audio/effects/anonHeadbutt.ogg b/game/audio/effects/anonHeadbutt.ogg index cd2a78c8..6d5b79e1 100644 Binary files a/game/audio/effects/anonHeadbutt.ogg and b/game/audio/effects/anonHeadbutt.ogg differ diff --git a/game/audio/effects/anonShooterFall.ogg b/game/audio/effects/anonShooterFall.ogg index 9cc5c717..d1a93a09 100644 Binary files a/game/audio/effects/anonShooterFall.ogg and b/game/audio/effects/anonShooterFall.ogg differ diff --git a/game/audio/effects/anonStairFall.ogg b/game/audio/effects/anonStairFall.ogg index 9aab4d44..384c1e04 100644 Binary files a/game/audio/effects/anonStairFall.ogg and b/game/audio/effects/anonStairFall.ogg differ diff --git a/game/audio/effects/anonTheaterFall.ogg b/game/audio/effects/anonTheaterFall.ogg index b62719e2..fceb9cd0 100644 Binary files a/game/audio/effects/anonTheaterFall.ogg and b/game/audio/effects/anonTheaterFall.ogg differ diff --git a/game/audio/effects/badA.ogg b/game/audio/effects/badA.ogg index 6170ebc4..716d7bab 100644 Binary files a/game/audio/effects/badA.ogg and b/game/audio/effects/badA.ogg differ diff --git a/game/audio/effects/badB.ogg b/game/audio/effects/badB.ogg index 39031ea8..549bce29 100644 Binary files a/game/audio/effects/badB.ogg and b/game/audio/effects/badB.ogg differ diff --git a/game/audio/effects/badC.ogg b/game/audio/effects/badC.ogg index 087c7a65..8f5cce94 100644 Binary files a/game/audio/effects/badC.ogg and b/game/audio/effects/badC.ogg differ diff --git a/game/audio/effects/camera.ogg b/game/audio/effects/camera.ogg index f8ca5fb6..a666154b 100644 Binary files a/game/audio/effects/camera.ogg and b/game/audio/effects/camera.ogg differ diff --git a/game/audio/effects/cameraMult.ogg b/game/audio/effects/cameraMult.ogg index 9b278826..d2f1037f 100644 Binary files a/game/audio/effects/cameraMult.ogg and b/game/audio/effects/cameraMult.ogg differ diff --git a/game/audio/effects/cameraShutterClick.ogg b/game/audio/effects/cameraShutterClick.ogg index 710d015c..edd711d1 100644 Binary files a/game/audio/effects/cameraShutterClick.ogg and b/game/audio/effects/cameraShutterClick.ogg differ diff --git a/game/audio/effects/carKick1.ogg b/game/audio/effects/carKick1.ogg index d9a428a7..50dc85e6 100644 Binary files a/game/audio/effects/carKick1.ogg and b/game/audio/effects/carKick1.ogg differ diff --git a/game/audio/effects/carKick2.ogg b/game/audio/effects/carKick2.ogg index 8203f9c5..e046d5e9 100644 Binary files a/game/audio/effects/carKick2.ogg and b/game/audio/effects/carKick2.ogg differ diff --git a/game/audio/effects/carKick3.ogg b/game/audio/effects/carKick3.ogg index f91970de..3365c74c 100644 Binary files a/game/audio/effects/carKick3.ogg and b/game/audio/effects/carKick3.ogg differ diff --git a/game/audio/effects/carSuspension1.ogg b/game/audio/effects/carSuspension1.ogg index b0188f01..90a78673 100644 Binary files a/game/audio/effects/carSuspension1.ogg and b/game/audio/effects/carSuspension1.ogg differ diff --git a/game/audio/effects/cavemanMagic.ogg b/game/audio/effects/cavemanMagic.ogg index a0d839d5..6a382385 100644 Binary files a/game/audio/effects/cavemanMagic.ogg and b/game/audio/effects/cavemanMagic.ogg differ diff --git a/game/audio/effects/cellphone.ogg b/game/audio/effects/cellphone.ogg index 817b8990..f6ef53ef 100644 Binary files a/game/audio/effects/cellphone.ogg and b/game/audio/effects/cellphone.ogg differ diff --git a/game/audio/effects/clap.ogg b/game/audio/effects/clap.ogg index c391e67d..e9da3a3e 100644 Binary files a/game/audio/effects/clap.ogg and b/game/audio/effects/clap.ogg differ diff --git a/game/audio/effects/concertFail.ogg b/game/audio/effects/concertFail.ogg index 3c292465..7acd18a2 100644 Binary files a/game/audio/effects/concertFail.ogg and b/game/audio/effects/concertFail.ogg differ diff --git a/game/audio/effects/crowdCheer.ogg b/game/audio/effects/crowdCheer.ogg index 9df58908..2035ca19 100644 Binary files a/game/audio/effects/crowdCheer.ogg and b/game/audio/effects/crowdCheer.ogg differ diff --git a/game/audio/effects/doorSlam.ogg b/game/audio/effects/doorSlam.ogg index a390f04a..7f6e96ae 100644 Binary files a/game/audio/effects/doorSlam.ogg and b/game/audio/effects/doorSlam.ogg differ diff --git a/game/audio/effects/drumroll.ogg b/game/audio/effects/drumroll.ogg index 70db6fc1..8ef721fe 100644 Binary files a/game/audio/effects/drumroll.ogg and b/game/audio/effects/drumroll.ogg differ diff --git a/game/audio/effects/drumrollEnd.ogg b/game/audio/effects/drumrollEnd.ogg index 1d7a17d4..bf05f3b6 100644 Binary files a/game/audio/effects/drumrollEnd.ogg and b/game/audio/effects/drumrollEnd.ogg differ diff --git a/game/audio/effects/fangPunch.ogg b/game/audio/effects/fangPunch.ogg index 3ff0c39b..951fc0a3 100644 Binary files a/game/audio/effects/fangPunch.ogg and b/game/audio/effects/fangPunch.ogg differ diff --git a/game/audio/effects/fireworks.ogg b/game/audio/effects/fireworks.ogg new file mode 100644 index 00000000..d2cc53dc Binary files /dev/null and b/game/audio/effects/fireworks.ogg differ diff --git a/game/audio/effects/goodA.ogg b/game/audio/effects/goodA.ogg index 4b9fca19..982d4a66 100644 Binary files a/game/audio/effects/goodA.ogg and b/game/audio/effects/goodA.ogg differ diff --git a/game/audio/effects/goodB.ogg b/game/audio/effects/goodB.ogg index 150c439a..a5a35a0d 100644 Binary files a/game/audio/effects/goodB.ogg and b/game/audio/effects/goodB.ogg differ diff --git a/game/audio/effects/goodC.ogg b/game/audio/effects/goodC.ogg index 2db88cc6..85fdc467 100644 Binary files a/game/audio/effects/goodC.ogg and b/game/audio/effects/goodC.ogg differ diff --git a/game/audio/effects/lockerAnonsDead.ogg b/game/audio/effects/lockerAnonsDead.ogg index e3884f9d..ce5c10c1 100644 Binary files a/game/audio/effects/lockerAnonsDead.ogg and b/game/audio/effects/lockerAnonsDead.ogg differ diff --git a/game/audio/effects/lockerSmash.ogg b/game/audio/effects/lockerSmash.ogg index b9c7862f..97a3ddeb 100644 Binary files a/game/audio/effects/lockerSmash.ogg and b/game/audio/effects/lockerSmash.ogg differ diff --git a/game/audio/effects/orange.ogg b/game/audio/effects/orange.ogg index ab934623..77b7c2f9 100644 Binary files a/game/audio/effects/orange.ogg and b/game/audio/effects/orange.ogg differ diff --git a/game/audio/effects/paEndReverb.ogg b/game/audio/effects/paEndReverb.ogg index 4996db21..ff17af2b 100644 Binary files a/game/audio/effects/paEndReverb.ogg and b/game/audio/effects/paEndReverb.ogg differ diff --git a/game/audio/effects/projectorFallReverb.ogg b/game/audio/effects/projectorFallReverb.ogg index fea6f8e9..a079d7a2 100644 Binary files a/game/audio/effects/projectorFallReverb.ogg and b/game/audio/effects/projectorFallReverb.ogg differ diff --git a/game/audio/effects/rainStart.ogg b/game/audio/effects/rainStart.ogg index ccfb89f0..b8014682 100644 Binary files a/game/audio/effects/rainStart.ogg and b/game/audio/effects/rainStart.ogg differ diff --git a/game/audio/effects/rooftopDoorSmash.ogg b/game/audio/effects/rooftopDoorSmash.ogg index 16b76720..12ff4432 100644 Binary files a/game/audio/effects/rooftopDoorSmash.ogg and b/game/audio/effects/rooftopDoorSmash.ogg differ diff --git a/game/audio/effects/schoolBell.ogg b/game/audio/effects/schoolBell.ogg index 1e60be51..820f42db 100644 Binary files a/game/audio/effects/schoolBell.ogg and b/game/audio/effects/schoolBell.ogg differ diff --git a/game/audio/effects/shooterAnonStep.ogg b/game/audio/effects/shooterAnonStep.ogg index 4644f7f7..7755ee08 100644 Binary files a/game/audio/effects/shooterAnonStep.ogg and b/game/audio/effects/shooterAnonStep.ogg differ diff --git a/game/audio/effects/shooterFangJumps.ogg b/game/audio/effects/shooterFangJumps.ogg index 0bdba8b4..6e9704eb 100644 Binary files a/game/audio/effects/shooterFangJumps.ogg and b/game/audio/effects/shooterFangJumps.ogg differ diff --git a/game/audio/effects/shooterFinalReach.ogg b/game/audio/effects/shooterFinalReach.ogg index 0c695eb8..bb761817 100644 Binary files a/game/audio/effects/shooterFinalReach.ogg and b/game/audio/effects/shooterFinalReach.ogg differ diff --git a/game/audio/effects/shooterWitnessed.ogg b/game/audio/effects/shooterWitnessed.ogg index 0157fd6a..358f3294 100644 Binary files a/game/audio/effects/shooterWitnessed.ogg and b/game/audio/effects/shooterWitnessed.ogg differ diff --git a/game/audio/effects/shotTinnitus.ogg b/game/audio/effects/shotTinnitus.ogg index 81c3ad80..c88e2c39 100644 Binary files a/game/audio/effects/shotTinnitus.ogg and b/game/audio/effects/shotTinnitus.ogg differ diff --git a/game/audio/effects/showerDoor.ogg b/game/audio/effects/showerDoor.ogg deleted file mode 100644 index f44a9e70..00000000 Binary files a/game/audio/effects/showerDoor.ogg and /dev/null differ diff --git a/game/audio/effects/showerMuffledEnd.ogg b/game/audio/effects/showerMuffledEnd.ogg index 992ac989..19cfc326 100644 Binary files a/game/audio/effects/showerMuffledEnd.ogg and b/game/audio/effects/showerMuffledEnd.ogg differ diff --git a/game/audio/effects/showerStart.ogg b/game/audio/effects/showerStart.ogg index 956993c6..3f07dbdb 100644 Binary files a/game/audio/effects/showerStart.ogg and b/game/audio/effects/showerStart.ogg differ diff --git a/game/audio/effects/sizzle.ogg b/game/audio/effects/sizzle.ogg index c3238b78..3bae65e5 100644 Binary files a/game/audio/effects/sizzle.ogg and b/game/audio/effects/sizzle.ogg differ diff --git a/game/audio/effects/slapstickBigPunch.ogg b/game/audio/effects/slapstickBigPunch.ogg index 49da27f8..7ccb7462 100644 Binary files a/game/audio/effects/slapstickBigPunch.ogg and b/game/audio/effects/slapstickBigPunch.ogg differ diff --git a/game/audio/effects/slapstickGlassBreak.ogg b/game/audio/effects/slapstickGlassBreak.ogg index f80eddbe..961e3525 100644 Binary files a/game/audio/effects/slapstickGlassBreak.ogg and b/game/audio/effects/slapstickGlassBreak.ogg differ diff --git a/game/audio/effects/slapstickPunch.ogg b/game/audio/effects/slapstickPunch.ogg index 0eb0984a..e5540426 100644 Binary files a/game/audio/effects/slapstickPunch.ogg and b/game/audio/effects/slapstickPunch.ogg differ diff --git a/game/audio/effects/slapstickSuperPunch.ogg b/game/audio/effects/slapstickSuperPunch.ogg index a58b180d..f8d25402 100644 Binary files a/game/audio/effects/slapstickSuperPunch.ogg and b/game/audio/effects/slapstickSuperPunch.ogg differ diff --git a/game/audio/effects/slapstickThunder.ogg b/game/audio/effects/slapstickThunder.ogg index 9446a528..6d259cd1 100644 Binary files a/game/audio/effects/slapstickThunder.ogg and b/game/audio/effects/slapstickThunder.ogg differ diff --git a/game/audio/effects/slapstickWipe.ogg b/game/audio/effects/slapstickWipe.ogg index 273561ba..c48c3630 100644 Binary files a/game/audio/effects/slapstickWipe.ogg and b/game/audio/effects/slapstickWipe.ogg differ diff --git a/game/audio/effects/spearYellRumbleTinnitusProlongVoice.ogg b/game/audio/effects/spearYellRumbleTinnitusProlongVoice.ogg index 45bf28ae..5b9c6716 100644 Binary files a/game/audio/effects/spearYellRumbleTinnitusProlongVoice.ogg and b/game/audio/effects/spearYellRumbleTinnitusProlongVoice.ogg differ diff --git a/game/audio/effects/spearYellRumbleVoice.ogg b/game/audio/effects/spearYellRumbleVoice.ogg index b750a592..700782d9 100644 Binary files a/game/audio/effects/spearYellRumbleVoice.ogg and b/game/audio/effects/spearYellRumbleVoice.ogg differ diff --git a/game/audio/effects/spearYellRumbleVoicePA.ogg b/game/audio/effects/spearYellRumbleVoicePA.ogg index 933f0b63..c2cd5bd7 100644 Binary files a/game/audio/effects/spearYellRumbleVoicePA.ogg and b/game/audio/effects/spearYellRumbleVoicePA.ogg differ diff --git a/game/audio/effects/splash.ogg b/game/audio/effects/splash.ogg index 075607e7..51523006 100644 Binary files a/game/audio/effects/splash.ogg and b/game/audio/effects/splash.ogg differ diff --git a/game/audio/effects/strike.ogg b/game/audio/effects/strike.ogg index 652b6cc1..ef27722d 100644 Binary files a/game/audio/effects/strike.ogg and b/game/audio/effects/strike.ogg differ diff --git a/game/audio/effects/stringSnap.ogg b/game/audio/effects/stringSnap.ogg index bdf82456..2d97eacd 100644 Binary files a/game/audio/effects/stringSnap.ogg and b/game/audio/effects/stringSnap.ogg differ diff --git a/game/audio/effects/tableSlam.ogg b/game/audio/effects/tableSlam.ogg index 732be6a1..f81c8196 100644 Binary files a/game/audio/effects/tableSlam.ogg and b/game/audio/effects/tableSlam.ogg differ diff --git a/game/audio/effects/tableSlamNoBox.ogg b/game/audio/effects/tableSlamNoBox.ogg index b98e6d03..37a56a48 100644 Binary files a/game/audio/effects/tableSlamNoBox.ogg and b/game/audio/effects/tableSlamNoBox.ogg differ diff --git a/game/audio/effects/teenageCrowdLaugh.ogg b/game/audio/effects/teenageCrowdLaugh.ogg index c96346e6..90aa5a25 100644 Binary files a/game/audio/effects/teenageCrowdLaugh.ogg and b/game/audio/effects/teenageCrowdLaugh.ogg differ diff --git a/game/audio/effects/vines.ogg b/game/audio/effects/vines.ogg index a013f76a..c5796b5e 100644 Binary files a/game/audio/effects/vines.ogg and b/game/audio/effects/vines.ogg differ diff --git a/game/audio/effects/whoosh.ogg b/game/audio/effects/whoosh.ogg index 1bc17276..605e39b1 100644 Binary files a/game/audio/effects/whoosh.ogg and b/game/audio/effects/whoosh.ogg differ diff --git a/game/audio/effects/windStart.ogg b/game/audio/effects/windStart.ogg index fc4de134..91927e9c 100644 Binary files a/game/audio/effects/windStart.ogg and b/game/audio/effects/windStart.ogg differ diff --git a/game/audio/effects/woodSnap.ogg b/game/audio/effects/woodSnap.ogg index 56c9d446..ff58a95f 100644 Binary files a/game/audio/effects/woodSnap.ogg and b/game/audio/effects/woodSnap.ogg differ diff --git a/game/script/1.first-two-days-anon-meets-fang.rpy b/game/script/1.first-two-days-anon-meets-fang.rpy index 85001a0b..3ba61600 100644 --- a/game/script/1.first-two-days-anon-meets-fang.rpy +++ b/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 - play sound 'audio/effects/spearYellRumbleTinnitusProlongVoice.ogg' # TODO: volume boost, renpy volume controls cause this to clip horribly for values over 1.0 + $ renpy.music.set_volume(0.0, 0.5, 'music') + play audio 'audio/effects/spearYellRumbleVoice.ogg' + play sound [ "", '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 - play music 'audio/OST/we just turned on the microphone in our programmers_ house.ogg' fadein 2 + stop audio fadeout 2 + stop sound fadeout 2 + $ renpy.music.set_volume(1.0, 2, 'music') Sp "-dismissed Naomi." diff --git a/game/script/13A.fang-loses-it-after-losing-prom-queen.rpy b/game/script/13A.fang-loses-it-after-losing-prom-queen.rpy index 4ea90ef1..ee10ab40 100644 --- a/game/script/13A.fang-loses-it-after-losing-prom-queen.rpy +++ b/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' - - pause 2.25 + play sound 'audio/effects/showerStart.ogg' + pause 1.266 + 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." diff --git a/game/script/14A.KO_OP-ending.rpy b/game/script/14A.KO_OP-ending.rpy index ab07da74..529280c8 100644 --- a/game/script/14A.KO_OP-ending.rpy +++ b/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) diff --git a/game/script/8.anon-and-fang-study-together.rpy b/game/script/8.anon-and-fang-study-together.rpy index bed421d8..c72bb582 100644 --- a/game/script/8.anon-and-fang-study-together.rpy +++ b/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