music changes to some ch1 scenes, add another music channel for crossfade effect

game/script.rpy

@@ -23,8 +23,11 @@ init python:
         picked = random.randint(0,length - 1)
         fileName = files[picked]
         renpy.show(fileName, at_list=[randPosition])
+      # extra music channel so we can do crossfade instead of fadeout followed by fadein
+      renpy.music.register_channel("music1","sfx",True,tight=True)
       # allows playing looped ambience alongside music
       renpy.music.register_channel("ambient","sfx",True,tight=True)
+      renpy.music.register_channel("ambient1","sfx",True,tight=True)
       #for issue #13 not finalized
       #if persistent.scroll == True:
       #   config.keymap['dismiss'].append('mousedown_5')

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

@@ -621,9 +621,8 @@ label chapter_1:
         ease 0.35 yalign 0.0
         repeat
 
-    # TODO: prevent Naomi from seeing into the future
-    # e.g "Did you meet Spears yet?"
-    N "SO!{w=0.5} How’d it go!{w=0.3} Did you like Spears?{w=0.3} Were you able to get what you need?"
+    # N "SO!{w=0.5} How’d it go!{w=0.3} Did you like Spears?{w=0.3} Were you able to get what you need?"
+    N "SO!{w=0.5} How’d it go!{w=0.3} Did you meet Spears yet?{w=0.3} Do you have everything you need?"
 
     show naomi neutral flip at sright with ease
 
@@ -669,7 +668,8 @@ label chapter_1:
 
     # "I perk up at Naser’s interjection. Naomi looks disappointed for a second."
 
-    A "Not really,{w=0.4} just had to sign up for some handouts."
+    # A "Not really,{w=0.4} just had to sign up for some handouts."
+    A "Not really,{w=0.4} just need to sign up for some handouts."
 
     show naomi sad flip with dissolve
 
@@ -1186,19 +1186,24 @@ label chapter_1:
     I "I’m just getting thrown around today.{w=0.5} I don’t know."
 
     I "She looks familiar."
-
+    
+    stop ambient fadeout 1
     pause 1.0
 
     I "The band doesn’t bother introducing themselves."
 
     #also im convinced link related is the inspiration of song related
     #https://www.youtube.com/watch?v=Pbe9DkMyL8k
-    play music 'audio/OST/its_the_piece_of_shit_you_asked_for.ogg'
 
     I "Instead the purple one begins plucking her bass."
 
     I "It all went tumbling down from there."
 
+    pause 0.5
+    play music 'audio/OST/its_the_piece_of_shit_you_asked_for.ogg' volume 1
+    with hpunch
+    pause 2 
+
     I "What I thought was a guitar sounded horrifically wrong,{w=0.5} far too heavy."
 
     I "The lead guitarist was using a fucking bass."
@@ -1225,9 +1230,12 @@ label chapter_1:
     pause 0.7
 
     stop ambient fadeout 1
-    unknown "{cps=*0.5}PFFFT AHAHAHA{/cps}{w=0.4} THEY STILL FUCKING SUCK!!"
+    stop music fadeout 2
+    unknown "{cps=*0.5}PFFFT AHAHAHA{/cps}{w=0.5} THEY STILL FUCKING SUCK!!"
 
-    play ambient 'audio/effects/chatter loop.ogg' volume 2 fadein 1.0
+    play music 'audio/ost/Many Such Cases Of Being So True.ogg'
+    # TODO: find suitable jeering loop
+    # play ambient 'audio/effects/chatter loop.ogg' volume 2.5 fadein 1.0
 
     #(In-CG insult layers)
     window hide
@@ -1284,7 +1292,7 @@ label chapter_1:
 
     I "I watch as she grabs her bass and takes the arm of the purple one,{w=0.3} rushing off stage with the pink drummer."
     ###stop le music, needs some fine tuning
-    stop music fadeout 3.0
+    # stop music fadeout 3.0
     scene black with fade
 
     window hide
@@ -1303,10 +1311,17 @@ label chapter_1:
     show dimmer_darker behind anon, spears
     with fade
 
+    stop music fadeout 1
+    play music1 'audio/ost/you can_t sage here.ogg' fadein 1
+
     I "I turn towards the door and see Principal Spears,{w=0.4} a fierce glare freezing me in place."
 
+    pause 0.5
+
     Sp "Anon.{fast}"
 
+    pause 0.5
+
     I "{cps=*0.2}Oh fuck{/cps}"
 
     I "His voice is even more stern than this morning."
@@ -1360,7 +1375,7 @@ label chapter_1:
 
     Sp "Next time it will be campus clean-up."
 
-    stop music fadeout 0.5
+    stop music1 fadeout 0.5
     hide anon with Dissolve(1)
 
     show spears neutral flip with Dissolve(0.25)
@@ -1369,10 +1384,10 @@ label chapter_1:
 
     stop ambient fadeout 0.2
     show spears angry flip with Fade(.1, 0, .25, color="#fff")
-    play sound "audio/effects/spearYellVoice.wav"
+    play sound "audio/effects/spearYellVoice.ogg"
     with vpunch
 
-    Sp "{b}{cps=*0.5}WHOSE SORRY ASS AM I GOING TO HAVE TO SUPLEX!{/cps}{/b}" # TODO: suitable SFX, Spears yell?
+    Sp "{b}{cps=*0.5}WHOSE SORRY ASS AM I GOING TO HAVE TO SUPLEX!{/cps}{/b}" # TODO: volume boost, renpy volume multiplier sucks and makes this clip
 
     pause 0.5
 
@@ -1412,6 +1427,7 @@ label chapter_1:
 
     I "Naser’s Sis-"
 
+    stop music fadeout 1
     pause 0.5
 
     I "Oh."
@@ -1427,14 +1443,14 @@ label chapter_1:
 
     pause 0.5
 
-    ###Maybe a better alarm noise is needed
-    play sound "audio/effects/Alarm.ogg"
+    play sound "audio/effects/digital_alarm.ogg" # CC0
 
-    I "{cps=*20}*BLEEP*{w=0.7} *BLEEP*{w=0.7} *BLEEP*{w=0.7} *BLEEP*{w=0.7} *BLEEP*{w=0.7} *BLEEP*{/cps}"
+    I "{cps=*20}{w=0.4}*BLEEP*{w=0.5} *BLEEP*{w=0.5} *BLEEP*{w=0.5} *BLEEP*{w=0.5} *BLEEP*{w=0.5} *BLEEP*{/cps}"
 
     stop sound fadeout 0.2
 
     scene room anon dark with Dissolve(2.5)
+    play music "audio/OST/Beach Chill Out.ogg"
 
     I "The bane of all sleep echoes violently by my head,{w=0.3} swiftly erasing any traces of slumber."
 
@@ -1809,7 +1825,9 @@ label chapter_1:
     I "Poor Naser,{w=0.3} man.{w=0.5} Just wanted to help his sister."
 
     I "But it’s not like he did anything wrong."
+    pause 0.5
 
+    play music 'audio/OST/Those Other Two Weirdos.ogg' volume 0.8 fadein 3
     scene hallway
     show naomi unimpressed at sleft
     show reed neutral flip behind naomi:
@@ -1819,11 +1837,12 @@ label chapter_1:
     I "Just as I reach the office the sound of clinking glass draws my attention to the apricot asspain and some pink raptor."
 
     # TODO: music here for Reed's intro?
-
     show naomi angry with Dissolve(0.25)
 
+
     N "Is that contraband,{w=0.3} Reed?"
 
+
     show naomi unimpressed with Dissolve(.25)
     show reed explanatory flip
 
@@ -1880,6 +1899,7 @@ label chapter_1:
 
     hide reed with easeoutright
 
+    stop music fadeout 1.5
     pause 1.5
 
     I "The fuck just happened?"
@@ -2147,7 +2167,7 @@ label chapter_1:
     pause 0.75
 
     stop music
-    play ambient '<from 0.1 to 0.7>audio/effects/tinnitus.ogg' fadein 5.0 # TODO Spears yell w/ tinnitus
+    play sound 'audio/effects/spearYellRumbleTinnitusProlongVoice.ogg' # TODO: volume boost, renpy volume controls cause this to clip horribly for values over 1.0
 
     Sp "{b}NAOMI!!{/b}" with vpunch
 
@@ -2185,7 +2205,7 @@ label chapter_1:
 
     pause 0.5
 
-    stop ambient fadeout 1
+    stop sound fadeout 1
     play music 'audio/OST/we just turned on the microphone in our programmers_ house.ogg' fadein 2
 
     Sp "-dismissed Naomi.{w=0.5} And just to be absolutely clear,{w=0.3} Anon did ask you for this,{w=0.4} correct?"