Merge branch 'Patch7' of https://git.snootgame.xyz/nutbuster/SnootGame into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/177

game/script.rpy

@@ -272,6 +272,7 @@ image fang c shocked flip = im.Flip("fang/future sets/fang c shocked.png", horiz
 image reed shocked flip = im.Flip("reed/reed shocked.png", horizontal=True)
 image naser shocked flip = im.Flip("naser/naser shocked.png", horizontal=True)
 image naomi shocked flip = im.Flip("naomi/naomi shocked.png", horizontal=True)
+image naomi prom shocked flip = im.Flip("naomi/naomi prom shock.png", horizontal=True)
 image stella shock alt flip = im.Flip("stella/stella shock alt.png", horizontal=True)
 image rosa shocked flip = im.Flip("rosa/rosa shocked.png", horizontal=True)
 image trish shock flip = im.Flip("trish/trish shock.png", horizontal=True)
@@ -288,6 +289,7 @@ image naser considering flip = im.Flip("naser/naser considering.png", horizontal
 image naomi considering flip = im.Flip("naomi/naomi considering.png", horizontal=True)
 image naomi prom considering flip = im.Flip("naomi/naomi prom considering.png", horizontal=True)
 image rosa considering flip = im.Flip("rosa/rosa considering.png", horizontal=True)
+image rosa future considering flip = im.Flip("rosa/rosa future considering.png", horizontal=True)
 image trish considering flip = im.Flip("trish/trish considering.png", horizontal=True)
 image stella considering flip = im.Flip("stella/stella considering.png", horizontal=True)
 image stella prom considering flip = im.Flip("stella/stella prom considering.png", horizontal=True)
@@ -353,6 +355,7 @@ image trish future unimpressed flip = im.Flip("trish/trish future unimpressed.pn
 image fangdad unimpressed flip = im.Flip("fangparents/fangdad unimpressed.png", horizontal=True)
 image fangmom unimpressed flip = im.Flip("fangparents/fangmom unimpressed.png", horizontal=True)
 image rosa unimpressed flip = im.Flip("rosa/rosa unimpressed.png", horizontal=True)
+image rosa future unimpressed flip = im.Flip("rosa/rosa future unimpressed.png", horizontal=True)
 
 #annoyed flip
 image naser annoyed flip = im.Flip("naser/naser annoyed.png", horizontal=True)
@@ -384,7 +387,7 @@ image reed sunglasses flip = im.Flip("reed/reed sunglasses.png", horizontal=True
 image trish prom bass flip = im.Flip("trish/trish prom bass.png", horizontal=True)
 image trish smug flip = im.Flip("trish/trish smug.png", horizontal=True)
 image naser smug flip = im.Flip("naser/naser smug.png", horizontal=True)
-image rosa future flip = im.Flip("rosa/rosa future.png", horizontal=True)
+image rosa future neutral flip = im.Flip("rosa/rosa future neutral.png", horizontal=True)
 image jinflip = im.Flip("other/jin.png", horizontal=True)
 image farnsworth flip = im.Flip("other/farnsworth.png", horizontal=True)
 image carldelewski flip = im.Flip("other/carldelewski.png", horizontal=True)
@@ -404,6 +407,8 @@ image fang embarass flip = im.Flip("fang/emotive set/fang embarass.png", horizon
 image fang adorable flip = im.Flip("fang/emotive set/fang adorable.png", horizontal=True)
 image fang c prom surprised flip = im.Flip("fang/prom sets/fang c prom surprised.png", horizontal=True)
 image fang c prom hiding flip = im.Flip("fang/prom sets/fang c prom hiding.png", horizontal=True)
+image reed_future_neutral_flip_hack = im.Flip("reed/reed future neutral.png", horizontal=True)
+image fang_adorable_flip_hack = im.Flip("fang/emotive set/fang adorable.png", horizontal=True)
 
 # trish fam flips
 image chondra neutral flip = im.Flip("trishfam/chondra neutral.png", horizontal=True)
@@ -527,8 +532,8 @@ image naser fullystained neutral = Composite(
 image naser fullystained surprised = Composite(
    (1412, 1500),
    (0, 0), "naser surprised",
-   (-15, -15), "ccf_rstain",
-   (-235, -20), "ccf_lstain"
+   (15, 1), "ccf_rstain",
+   (-165, -8), "ccf_lstain"
 )
 
 image naser fullystained explanatory = Composite(
@@ -1122,7 +1127,7 @@ image anon smiley = "images/anon/base set/anon face happy.png"
 image gold_fang_home_prom_stars = "images/cgs/stair3.jpg"
 image good_fang_home_prom_stars = "images/cgs/stair2.jpg"
 image other_fang_home_prom_stars = "images/cgs/stair1.jpg"
-image anonfang_xmasmorningbed = "images/cgs/anonchristmasmorning.jpg"
+image anonfang_xmasmorningbed = "images/anon/Other/anonchristmasmorning.png"
 
 #sepia effect for flashbacks
 image grainf0 = "images/other/grain/frame_00.png"

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

@@ -57,6 +57,8 @@ label chapter_1:
     pause .5
 
     "I whip out my phone, and consider the best way to make people upset online."
+    window hide
+    window auto
     pause .5
     menu:
         "Reply to the obvious shill thread":
@@ -65,7 +67,7 @@ label chapter_1:
         "Bait the obvious underaged poster":
             pass
 
-
+    pause .5
     "The thread goes 404 right as I'm ready to post my well thought-out reply."
 
     "Better hide my phone before someone sees fit to take it from me, the only human around town. I think."
@@ -74,7 +76,7 @@ label chapter_1:
 
     $ renpy.music.set_volume(0.8, 8, 'ambient')
     play ambient2 'audio/effects/teenageCrowdMurmurLoop.ogg' volume 1.4 fadein 8.0
-    pause .5
+    pause 1.5
 
     "It’s the sounds that reach me first.{w=.4} The chatter of people milling about."
     pause .5
@@ -94,6 +96,8 @@ label chapter_1:
     pause .5
 
     "{cps=*0.2}{b}{size=+10}{i}Volcano High{/i}{/size}{/b}{/cps}"
+    window hide
+    window auto
     pause .5
 
     $ renpy.music.set_volume(0.7, 0, 'ambient1')
@@ -110,16 +114,20 @@ label chapter_1:
 
     window hide
     window auto
+    pause 0.5
 
     show anonphone with easeinbottom
+    pause 0.5
     "A check of my phone says I’m 30 minutes early."
 
     "Wonderful."
 
     window hide
     window auto
+    pause 0.5
 
     hide anonphone with easeoutbottom
+    pause 0.5
 
     "I move to the entrance, only to see all of the steps occupied by students."
 
@@ -259,7 +267,8 @@ label chapter_1:
     scene black with Dissolve(1)
     pause 0.5
     scene garden
-    show anon neutral flip at scenter
+    show anon neutral flip at scenter:
+        yalign 0.1
     play ambient 'audio/effects/outdoorNatureLoop.ogg' fadein 6
     play ambient1 'audio/effects/teenageCrowdFarLoop.ogg' volume 0.4 fadein 2.0
     with Dissolve(1)
@@ -273,14 +282,22 @@ label chapter_1:
     pause .5
 
     "It was perfect."
-    pause 0.5
+    window hide
+    window auto
+    pause 0.25
+
+    show anon:
+        easein_cubic 1 xalign 0.45
+        easein_back 1 yalign 0.0
+    pause 1.5
 
     "I flop down on the wet bench and the violent crack from it makes my heart drop."
+    pause .5
 
     "Almost perfect but good enough."
     pause .5
 
-    "I feel a tightness in my chest,and my lungs fight to draw air in."
+    "I feel a tightness in my chest and my lungs fight to draw air in."
 
     show anon sad flip with dissolve
     pause 0.5
@@ -296,9 +313,10 @@ label chapter_1:
 
     "Three weeks."
 
-    "It took a day for me to want to change schools, and three weeks to make it happen."
+    "It took a day for me to want to change schools, three weeks to make it happen, and now this is my life for the next year. "
+    pause 0.5
 
-    "And this is my life now for the next year. I think back to my old man’s ultimatum."
+    "I think back to my old man’s ultimatum."
 
     "{i}Once the lease is done, Anon, either college or the service.{/i}"
 
@@ -345,6 +363,8 @@ label chapter_1:
     "I lay on the ground, ass hurt from hitting jagged concrete and splintered wood."
 
     "Thank god for jeans."
+    window hide
+    window auto
 
     stop ambient fadeout 1
     stop ambient1 fadeout 1
@@ -360,11 +380,11 @@ label chapter_1:
 
     "I groan."
 
-    A "{cps=*0.35}Never better{/cps}"
+    A "{cps=*0.35}Never better...{/cps}"
 
     "I instinctively apply my ‘chill guy’ facade in the presence of strangers to hide how uneasy I am today."
 
-    "A hand is held over my face.{w=0.5} In my pain addled confusion I shake it."
+    "A hand is held over my face.{w=0.5} In my pain addled confusion, I shake it."
     pause .5
 
     unknown "Naser!"
@@ -389,7 +409,9 @@ label chapter_1:
         easein_cubic 1 xalign 1.4
     pause 0.5
 
-    show anon neutral at acenter with dissolve
+    show anon neutral with dissolve:
+        yalign -0.2 xalign 0.5
+        easein_cubic 1 yalign 0.1
 
     "The force is enough for my feet to get under me, stumbling back up to stand before the pair of strangers."
 
@@ -450,12 +472,12 @@ label chapter_1:
 
     "The title alone makes me gag."
 
-    "The pink one, Naomi, looks at me expectantly."
+    "The orange one, Naomi, looks at me expectantly."
     pause .5
 
     "The brochure is full of the typical trivialities."
 
-    "College prep, financial assistance, after school programs."
+    "College prep, financial assistance, after school programs{cps=*.1}...{/cps}"
 
     "None of it matters."
 
@@ -753,7 +775,7 @@ label chapter_1:
         easein_back 0.5 xalign 0.45
 
     show naomi happy flip with Dissolve(.25)
-    N "We share first period and english together!"
+    N "We share first period and English together!"
 
     N "Come on, I’ll introduce you to the class and you’ll be able to make all sorts of new friends!"
 
@@ -1070,24 +1092,31 @@ label chapter_1:
     "I don’t want to make a scene."
     pause .6
 
-    A "{cps=*0.2}Suuuure{/cps}{cps=*0.1}..{/cps}"
+    A "{cps=*0.2}Suuuure{/cps}{cps=*0.1}...{/cps}"
 
     window hide
     window auto
 
     pause .5
 
+    scene black with Dissolve(1)
+
     #TODO: music variation
     stop ambient fadeout 3
     play music 'audio/OST/Dragging on and on....ogg' fadein 1
+
+    pause .25
+
     scene cafeteria
     show anon neutral at aleft
     show naomi neutral flip at sright
     show naser neutral flip behind naomi:
         xalign 0.7 yalign 0.1
-    with fade
+    with Dissolve(1)
+    pause .5
 
     "Before I even sit down the barrage of questions begins."
+    pause .5
 
     show naomi explanatory flip:
         ease 0.18 yalign 0.05
@@ -1095,7 +1124,13 @@ label chapter_1:
         pause .25
         repeat
 
-    N "SO!{w=0.4} What do you think of Volcano High!{w=0.3} How about your classes?{w=0.3} You seem-"
+    N "SO!{w=0.5}{nw}"
+
+    N "What do you think of Volcano High?{w=0.4}{nw}"
+
+    N "How about your classes?{w=0.3}{nw}"
+
+    N "You seem-{w=0.3}{nw}"
 
     "I just nod along, starting to not pay attention."
 
@@ -1198,7 +1233,7 @@ label chapter_1:
     N "I know some {i}great{/i} vegan shops in the area!"
     pause .5
 
-    "My stomach roils at the V-word."
+    "My stomach rolls at the V-word."
 
     A "{cps=*0.25}Maaaaybe{/cps} another time, sorry."
 
@@ -1351,7 +1386,7 @@ label chapter_1:
 
     A "{cps=*0.15}FWR?{/cps}{w=0.4} Like, Franklin W. Roosevelt?"
 
-    Nas "Nah.{w=0.4} Fucked wing retard."
+    Nas "Nah.{w=0.4} Fucked-wing retard."
 
     show naser unimpressed with Dissolve(.25)
     Nas "Fang’s words, not mine."
@@ -1403,7 +1438,7 @@ label chapter_1:
     stop music fadeout 6
     pause .5
 
-    "Finally the doors open and I smell the cheesy, heart clogging goodness within."
+    "Finally the doors open and I smell the cheesy, heart-clogging goodness within."
 
     show naser happy with dissolve
     Nas "Sweet. Come on, Anon."
@@ -1529,7 +1564,7 @@ label chapter_1:
     hide naser with dissolve
     pause .5
 
-    "Left on my own I stack my plate up with some quality grease topped delight."
+    "Left on my own I stack my plate up with some quality grease-topped delight."
 
     show anon:
         easein_quart 1.0 xalign 1.15 yalign 0.01
@@ -1622,22 +1657,14 @@ label chapter_1:
     A "I don’t, what are you talking about man?"
 
     show naser annoyed at nleft with dissolve
-
     pause 1.0
-
     show naser angry with Dissolve(0.25)
+    stop music fadeout 3
 
     Nas "{cps=*0.5}I brought them here so Fang has an audience.{/cps}"
-
-    pause 0.25
-
-    $ renpy.music.set_volume(0, 0.02, 'music')
-    stop music fadeout 0.2
-    pause 0.75
+    pause 1
 
     A "Oh."
-
-    $ renpy.music.set_volume(1, 0, 'music')
     pause 1
 
     play sound 'audio/effects/cellphone.ogg' # CC0
@@ -1654,7 +1681,7 @@ label chapter_1:
     show naser:
         easeout_cubic 1 xalign -1.0
     show naser flip neutral with Dissolve(0.25)
-    pause 0.25
+    pause 0.15
     hide naser with dissolve
 
     pause 0.5
@@ -2107,7 +2134,7 @@ label chapter_1:
 
     "Finally, I lean out of bed and turn the alarm clock off."
 
-    "I have a good forty-five minutes before I need to be at school, and it takes twenty to walk."
+    "I have a good forty-five minutes before I need to be at school - and it takes twenty to walk."
 
     "That leaves twenty-five minutes to get ready."
 
@@ -2130,7 +2157,7 @@ label chapter_1:
 
     pause 1.5
 
-    "A tiny one room apartment with only a computer, bed, television, and fridge."
+    "A tiny, one room apartment with only a computer, bed, television, and fridge."
 
     "A whole year in this shithole."
 
@@ -2144,7 +2171,7 @@ label chapter_1:
     show anon neutral at acenter with Dissolve(1)
     pause .5
 
-    "Picking myself up, I slide into todays’{w=0.2} (and everydays’){w=0.2} clothes and pour myself a bowl of off-brand cereal I picked up the day before."
+    "Picking myself up, I slide into todays’{w=0.2} (and everyday's){w=0.2} clothes and pour myself a bowl of off-brand cereal I picked up the day before."
 
     "My eyes scan over my phone while I shovel my sugary breakfast into my mouth."
     pause .5
@@ -2157,10 +2184,10 @@ label chapter_1:
 
     "*Crunch*{fast}"
 
-    "Like a poorly oiled machine until it runs out of fuel with a noisy slurp."
+    "Like a poorly-oiled machine until it runs out of fuel with a noisy slurp."
     pause .5
 
-    "Soon enough it's time to leave for school. I grab my backpack and slide it over my shoulders."
+    "Soon enough, it's time to leave for school. I grab my backpack and slide it over my shoulders."
 
     "I take my jacket off the hanger and{cps=*.1}...{/cps}"
 
@@ -2190,7 +2217,7 @@ label chapter_1:
 
     "I approach the grand building, looking to find a place in line between the other students trundling into the front doors."
 
-    "The halls before class are as crowded as always, hundreds of students filing in unison towards their homerooms."
+    "The halls before class are as crowded as always, with hundreds of students filing in unison towards their homerooms."
 
     "By now I was starting to be able to make my way around on autopilot, I've walked the same path twice already after all."
     pause .5

game/script/12C.anon-fang-lovey-dovey.rpy

@@ -84,7 +84,7 @@ label chapter_12C:
     Lucy "I've kissed shorter snouts, yours can't be that different."
     pause 0.5
 
-    Lucy "Uh...{w=0.3}look Anon, if it doesn't work out..."
+    Lucy "Uh{cps=*0.1}...{/cps} look Anon, if it doesn't work out..."
 
     Lucy "{cps=*0.1}...{/cps}It won't change anything.{w=0.3} Right?"
 
@@ -431,7 +431,7 @@ label chapter_12C:
 
     scene campsite
     show anon neutral:
-        xalign 0.0
+        xalign 0.0 yalign 0.1
     with dissolve
     pause 0.5
 
@@ -473,18 +473,18 @@ label chapter_12C:
     pause 0.5
 
     show anon:
-        easein_cubic 1 xalign -0.2
+        easein_cubic 1.5 xalign -0.2
     show rosa behind anon:
-        easein_cubic 1 xalign 0.2
+        easein_cubic 1.5 xalign 0.2
     pause 0.0001
     show stella neutral flip:
         xalign 1.4
-        easein_cubic 1 xalign 1.0
+        easein_cubic 1.5 xalign 1.0
     show fang neutral flip behind stella:
         xalign 2.0 yalign 0.0
-        easein_cubic 1 xalign 1.0
+        easein_cubic 1.5 xalign 1.0
     with dissolve
-    pause 0.5
+    pause 1
 
     stop music fadeout 3.0
     play ambient 'audio/effects/nightLoop.ogg' fadein 2
@@ -594,16 +594,13 @@ label chapter_12C:
     A "Whatever, I like it rare anyways."
 
     Lucy "You should be thanking me, then."
-    window hide
-    window auto
-
-    show anon neutral with dissolve
-    pause 0.5
 
     show fang:
         ease_cubic 1 xalign 0.35
     pause 0.25
-    show fang happy with dissolve
+    show fang happy
+    show anon neutral
+    with dissolve
 
     "She leans her head into my shoulder."
     pause 0.5
@@ -648,10 +645,13 @@ label chapter_12C:
     Lucy "Guess I really have been changing a lot."
     pause 0.5
 
-    Lucy "... Your kebab’s on fire."
+    Lucy "{cps=*0.1}...{/cps}Your kebab’s on fire."
+    pause 0.5
 
-    show anon ohshit with dissolve
-    A "Huh- Shit!"
+    A "Huh- {w=.5}{nw}"
+    show anon ohshit
+
+    extend "Shit!"
 
     "I blow out the now burnt chunks of meat."
     show anon neutral with dissolve

game/script/12D.aquarium.rpy

@@ -214,10 +214,17 @@ label chapter_12D:
 
     #scene aquariumexhibit
     #intentional ghost / meteor walk
+
+    play sound 'audio/effects/whoosh.ogg'
+
     show fang:
-        ease_cubic 0.6 xalign 0.0
-    show fang adorable flip
-    with dissolve
+        easein_cubic 0.3 xalign 1.25
+    pause 0.0001
+    show fang_adorable_flip_hack behind anon:
+        xalign 0.5
+        easein_cubic 0.3 xalign 0.0
+    hide fang
+    with Dissolve(.15)
     show anon neutral flip with dissolve
 
     #confirmed that fang has autism
@@ -286,12 +293,14 @@ label chapter_12D:
     #window auto
 
     #show anonphone at scenter with easeinbottom
-    show anonphone at scenter with dissolve #cursed
+    show anonphone at scenter with dissolve
 
     "She’ll probably kill me if she found out."
     hide fang adorable with dissolve
+
     "But it’d be a good death."
     pause 0.5
+
     "Wait, where’d she go?"
 
     #hide anonphone with dissolve

game/script/13C.fang-and-anon-go-to-beach-and-prom.rpy

@@ -951,7 +951,7 @@ label chapter_13C:
 
     Lucy "Surprise?"
 
-    Sp "Yeah, the one you filed papers for a few weeks back."
+    Sp "Yeah, the one you filled papers for a few weeks back."
 
     Sp "Everything's ready for it."
     pause 0.5
@@ -1736,7 +1736,8 @@ label chapter_13C:
         easein_cubic 1 xalign 0.8
         pause .25
         easein_cubic 0.75 xalign 0.7
-        easein_cubic 0.75 xalign 0.8
+        pause .25
+        ease_cubic 1 xalign 0.8
 
     show fang:
         pause 2.25
@@ -3009,6 +3010,7 @@ label chapter_13C:
     show fang:
         linear 0.5 alpha 0
     show fangphonevideocall call_ended_bg_black call_ended_poff at scenter with easeinbottom
+    pause 0.5
 
     "We curl together on my bed, staring at Lucy's phone app boot up."
 
@@ -3069,6 +3071,9 @@ label chapter_13C:
     Lucy "I'm good at forgetting things on demand."
     pause 0.5
 
+    show anon:
+        easein_cubic 1 xalign 0.58
+
     "I take her hand and give it a reassuring squeeze."
     show fang neutral
     show anon behind fang
@@ -3087,12 +3092,10 @@ label chapter_13C:
     pause 0.5
     
     show anon:
-        easeout_cubic 1.5 xalign -0.2
-    show fang behind anon with dissolve
+        easeout_cubic 1.5 xalign 1.5
+    show anon neutral with dissolve
     pause 0.4
-    hide anon
-    show fang neutral flip
-    with dissolve
+    hide anon with dissolve
 
     "I move to the kitchen, and look through my minifridge."
 
@@ -3100,7 +3103,7 @@ label chapter_13C:
     pause 0.25
 
     show fang:
-        easeout_cubic 1 xalign -0.5
+        easeout_cubic 1 xalign 1.0
     pause 0.4
     hide fang with dissolve
 
@@ -4564,7 +4567,6 @@ label chapter_13C:
 
     play music "audio/OST/ballad_of_the_boot.ogg" fadein 2.0
     scene white
-    show anon neutral flip at acenter
     show hotel behind anon
     with Dissolve(2)
     pause 0.5

game/script/13D.fang-plays-well,-naomi-jealous,-fang-talks-to-anon-to-break-up-while-she-thinks-about-her-life.rpy

@@ -345,32 +345,37 @@ label chapter_13D:
     A "And how does that make you feel, Fang?"
     window hide
     window auto
-    pause 0.5
+    pause 0.25
+
+    image naomi prom alaska:
+        "naomi prom shocked flip"
+        matrixcolor SaturationMatrix(0, (0.40, 0.40, 0.40))
+        #easeout_cubic 0.3 matrixcolor TintMatrix(Color((1.2*255, 1.2*255, 1.2*255)))
+        #easeout_cubic 1.80 matrixcolor TintMatrix(Color((255, 255, 255)))
+        #matrixcolor SaturationMatrix(1, (0.34, 0.34, 0.34)) #how the fuck does this work?
+        #ease_cubic 0.4 matrixcolor SaturationMatrix(0, (0.40, 0.40, 0.40))
+        #pause 1.0
+        #ease_cubic 1.0 matrixcolor SaturationMatrix(1, (0.40, 0.40, 0.40))
+    #ease_cubic 0.3 matrixcolor SaturationMatrix(0, (1.0, 1.0, 1.0))
+
 
     show fang d prom happy flip at sright with dissolve:
         xalign 1.7
         easein_cubic 1 xalign 1.3
-    pause 1.5
+    pause 1
+
+    show naomi prom alaska:
+        xalign 0.48
+        easein_elastic 0.35 xalign 0.5
+
+    play sound 'audio/effects/slapstickGlassBreak.ogg'
+
+    pause 1
 
     $ renpy.music.set_volume(1, 0, 'music')
     play music "audio/OST/punk_revamp.ogg" fadein 1.0
 
-    image naomi prom alaska:
-        "naomi prom neutral flip"
-        #easeout_cubic 0.3 matrixcolor TintMatrix(Color((1.2*255, 1.2*255, 1.2*255)))
-        #easeout_cubic 1.80 matrixcolor TintMatrix(Color((255, 255, 255)))
-        matrixcolor SaturationMatrix(1, (0.34, 0.34, 0.34)) #how the fuck does this work?
-        ease_cubic 0.4 matrixcolor SaturationMatrix(0, (0.40, 0.40, 0.40))
-        pause 1.0
-        ease_cubic 1.0 matrixcolor SaturationMatrix(1, (0.40, 0.40, 0.40))
-#ease_cubic 0.3 matrixcolor SaturationMatrix(0, (1.0, 1.0, 1.0))
-
-    #show naomi prom alaska
-    show naomi prom considering flip with dissolve
-    "Naomi goes white as a sheet."
-    pause 0.5
-
-    #play sound 'audio/effects/slapstickGlassBreak.ogg'
+    #"Naomi goes white as a sheet."
 
     F "Well since you’ve asked, Anon, I’d be glad to share."
     show naomi prom considering with dissolve
@@ -383,6 +388,7 @@ label chapter_13D:
     pause 0.5
 
     N "I-I see. Very impressive."
+    pause 0.5
 
     F "Why do you look so surprised? Isn’t me being invisible exactly what you want?"
 
@@ -420,8 +426,15 @@ label chapter_13D:
     pause 0.5
 
     "In a flash Fang strikes Naomi right across the face."
-    window hide Dissolve(0.0001)
+    window hide
     window auto
+    pause 0.25
+
+    play audio 'audio/effects/whoosh.ogg'
+    show fang:
+        easein_quart 0.5 xalign 0.9
+    show naomi prom shock with Dissolve(.25)
+
     play sound 'audio/effects/slapstickPunch.ogg'
     show white
     hide anon
@@ -1839,7 +1852,7 @@ label chapter_13D:
         xalign 0.65 alpha 0
         linear 0.5 alpha 1
     pause 0.0001
-    hide anonphone with dissolve
+    hide anonphone with easeoutbottom
     pause 0.5
 
     "I attach a picture I took of Stella earlier when her date was in the restroom."
@@ -2548,6 +2561,9 @@ label chapter_13D:
     "Right as I reach into my pocket for my phone, a van chugs onto the sand from the distance."
 
     "It stops right in front of me and Trish flies out the side door, gasping for breath."
+    window hide
+    window auto
+
 
     show anon:
         pause 0.75
@@ -2582,6 +2598,7 @@ label chapter_13D:
     "The drivers’ door opens, letting out a gust of smoke from within."
 
     "Reed emerges from the cloud as if nothing’s wrong."
+    pause 0.5
 
     T "Reed... {w=0.2}*huff*... {w=0.2}Your car.... {w=0.2}*huff*{cps=*.1}...{/cps}"
     pause 0.5
@@ -2682,7 +2699,7 @@ label chapter_13D:
     show lighter with Dissolve(0.1):
         xpos 0.1
         ypos 0.3
-        zoom 0.42
+        zoom 0.70
         rotate 40
         linear 0.6 align (0.5, 0.5) knot (0.45, 0.10) rotate -270
     hide lighter with dissolve
@@ -2764,7 +2781,7 @@ label chapter_13D:
             repeat 10
 
     "Naomi erupts from the car in a frothing rage, her shirt noticeably stained an orange-red."
-    pause 0.5
+    show fang happy with dissolve
 
     F "Ha! Wish I did."
 
@@ -2778,6 +2795,9 @@ label chapter_13D:
     Nas "Yeah, why?"
 
     Re "Just a feeling."
+
+    show naomi:
+        easein_cubic 1 xalign 0.65
     show naomi sad flip with dissolve
 
     N "This stuff has been happening ever since that picture of me was posted online."
@@ -2807,22 +2827,26 @@ label chapter_13D:
     #   ease_cubic 0.5 xalign -0.70
 
     "Reed taps my back and pulls my eyes away from the spatial anomaly."
+    show anon neutral flip with dissolve
 
     Re "Hurry up and start the fire, man{cps=*.1}...{/cps}"
 
     Re "I got the booze all ready."
     window hide
     window auto
-    pause .25
+    show anon neutral with dissolve
 
     show anon:
         easein_cubic 0.75 xalign 0.25
-        pause 1
+        pause 0.75
         ease_cubic 1.5 xalign 0.1
 
-    pause 0.75
+    pause 0.5
     play sound 'audio/effects/cavemanMagic.ogg'
-    pause 1
+    pause 0.5
+    show trish smile
+    show naser happy flip
+    with dissolve
 
     "Once the bonfire was set ablaze Stella and Trish started setting up the speakers around in a radius."
     pause .5
@@ -2850,9 +2874,10 @@ label chapter_13D:
     Re "Went all in man, got the name brands and everything."
 
     A "I’m surprised you got Naser to let you bring this stuff."
+    pause 0.5
 
     "Naser returns to the rest of the group, wearing his jacket again."
-    pause .5
+    show naser neutral flip with dissolve
 
     Nas "Got me to agree to what?"
     pause .5
@@ -2861,6 +2886,7 @@ label chapter_13D:
 
     show naser shocked flip
     show naomi shocked flip
+    show rosa considering flip
     with dissolve
 
     Nas "You brought alcohol?!"
@@ -2884,6 +2910,7 @@ label chapter_13D:
     pause .5
 
     Re "Besides, I did think of you and Naomi."
+    show naser neutral flip with dissolve
 
     Nas "Huh?"
     show reed happy with dissolve
@@ -2897,7 +2924,9 @@ label chapter_13D:
     Nas "You{cps=*.1}...{/cps} Whatever, I’ll try to keep Naomi from calling the police, fine."
 
     Re "You’re a real bro, man{cps=*.1}...{/cps}"
-    show naser neutral flip with dissolve
+    show naser neutral flip
+    show rosa neutral flip
+    with dissolve
 
     Re "If everyone’s ready then let’s get started!"
     window hide
@@ -3276,7 +3305,7 @@ label chapter_13D:
     window auto
     pause .5
 
-    scene blue
+    scene room anon day
     show anonfang_xmasmorningbed
     with Dissolve(1)
     pause 1

game/script/14D.gold-ending.rpy

@@ -301,7 +301,7 @@ label chapter_14D:
     stop ambient fadeout 1
     play music "audio/OST/Ramo de Rosas.ogg" fadein 1.0
 
-    show rosa future flip at sright behind reed with dissolve:
+    show rosa future neutral flip at sright behind reed with dissolve:
         xalign 1.6
         easein_cubic 1.5 xalign 1.25
     pause .5
@@ -319,12 +319,12 @@ label chapter_14D:
     window auto
 
     show anond:
-        easein_cubic 0.6 xalign -0.1
+        easein_cubic 1 xalign -0.1
     show reed:
-        easein_cubic 0.6 xalign 0.15
-    show rosa future flip at sright:
-        easein_cubic 0.6 xalign 1.35
-    show trish future neutral flip at tcenter with dissolve:
+        easein_cubic 1 xalign 0.15
+    show rosa future neutral flip at sright:
+        easein_cubic 1 xalign 1.35
+    show trish future neutral flip at tcenter behind rosa with dissolve:
         xalign 0.75
     pause .5
 
@@ -357,7 +357,7 @@ label chapter_14D:
     T "They’re telling me people would rather go to the dentist with all the drills we use."
 
     T "And mostly with my designs for hollowed-out horns."
-    pause .5
+    show rosa future considering flip with dissolve
 
     "Rosa instinctively rubs her own horn."
     pause .5
@@ -392,7 +392,7 @@ label chapter_14D:
     pause .5
 
     "Reed shakes his head."
-    pause .5
+    show rosa future unimpressed flip with dissolve
 
     Ro "Anything more than a regular piercing is an abomination before our Lord."
     show trish future unimpressed flip with dissolve
@@ -411,17 +411,21 @@ label chapter_14D:
 
     show anond:
         easein_cubic 1 xalign 0.15
-    show reed:
-        easein_cubic 1 xalign 0.725
+    show reed behind trish, rosa:
+        easein_cubic 1 xalign 0.4
     show rosa:
         easein_cubic 1 xalign 1.45
     show trish:
         easein_cubic 1 xalign 0.875
 
     pause 0.0001
-    show reed future neutral flip 
-    show anond neutral flip 
+    hide reed
+    show reed_future_neutral_flip_hack behind trish, rosa:
+        xalign 0.5 yalign 0.1
+        easein_cubic 1 xalign 0.725
+    show anond neutral flip behind reed_future_neutral_flip_hack
     show trish future smug flip
+    show rosa future neutral flip
     with dissolve
 
     show fang d shock with dissolve:
@@ -512,7 +516,7 @@ label chapter_14D:
         xalign 0.6
     show trish future neutral at tcenter:
         xalign 0.75
-    show rosa future flip at sright behind reed:
+    show rosa future neutral flip at sright behind reed:
         xalign 1.3
     with Dissolve(1)
     "She goes up onstage and tests the microphone, getting everyone’s attention."
@@ -727,7 +731,7 @@ label chapter_14D:
     show anond:
         pause .02
         easein_cubic 0.3 xalign 0.82
-        ease_cubic 0.4 xalign 0.8
+        ease_cubic 0.7 xalign 0.8
     "Lucy’s elbow finds it’s familiar spot in my side."
     pause 0.5
 
@@ -888,7 +892,6 @@ label chapter_14D:
     pause 1
 
     scene e4of4 with Dissolve(1.0)
-    stop music fadeout 15.0
     pause 16
     scene black with Dissolve(1.0)
     pause 1

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

@@ -41,17 +41,21 @@ label chapter_2:
     window auto
     pause .5
 
+    scene black with Dissolve(1)
+    pause 0.5
 
     play ambient 'audio/effects/outdoorLoop.ogg' fadein 3
-    scene skinrow with Fade(1, 0, 1)
-    pause .5
+    scene skinrow with Dissolve(1)
+    pause 0.5
 
     "It’s a bit of a walk, so I get my phone out and start posting on a shitty imageboard."
 
     window hide
     window auto
+    pause 0.5
 
     show anonphone at center with easeinbottom
+    pause 0.5
 
     "Baiting people into replying to my posts isn’t the most rewarding of hobbies, but it passes the time."
     pause .5
@@ -70,6 +74,7 @@ label chapter_2:
 
     window hide
     window auto
+    pause .5
 
     hide anonphone with easeoutbottom
 
@@ -78,10 +83,14 @@ label chapter_2:
 
     play music 'audio/OST/Dragging on and on....ogg'
     "She’s here."
+    window hide
+    window auto
+    pause .5
 
     scene outside school
     show anon neutral at aright
-    with fade
+    with Dissolve(1)
+    pause .5
 
     stop ambient fadeout 1
 
@@ -93,18 +102,23 @@ label chapter_2:
 
     window hide
     window auto
+    pause 0.25
 
-    show anon neutral with Dissolve(.25)
-
-    show naomi neutral at sleft with easeinleft
+    show naomi neutral:
+        xalign -0.5
+        easein_cubic 1 xalign 0.0
+    show anon neutral
+    with dissolve
+    pause .5
 
     "Naomi catches up to me."
 
-    show naomi explanatory
+    show naomi explanatory with dissolve
     N "You say something?"
-    show naomi neutral
 
-    show anon neutral flip with Dissolve(.25)
+    show anon neutral flip
+    show naomi neutral
+    with Dissolve(.25)
 
     A "Good morning."
     pause .5
@@ -309,11 +323,17 @@ label chapter_2:
     "She waves and runs off to a side door."
 
     "I should be getting to homeroom soon, too."
+    window hide
+    window auto
+    pause 0.5
+
+    scene black with Dissolve(1)
+    pause 0.5
 
     play ambient 'audio/effects/schoolLoop.ogg' fadein 3
     scene hallway
     show anon neutral flip at aright
-    with Fade(1, 0, 1)
+    with Dissolve(1)
     pause .5
 
     "I push open the usual side entrance I take and enter the hallway that’s starting to become familiar now."
@@ -1507,10 +1527,9 @@ label chapter_2:
     window auto
 
     show anon:
-        easeout 1 xalign 1.8
+        easeout_cubic 1 xalign 1.5
     pause 0.5
     hide anon with dissolve
-    with None
 
     show reed neutral:
         xalign 0.4
@@ -1520,12 +1539,15 @@ label chapter_2:
     "I swiftly snatch up the backpack by my leg, flashing an earnest sympathetic smile at them - or at least I thought it was one."
     window hide
     window auto
+    pause 0.5
+
+    show black with Dissolve(1)
+    pause 0.5
 
     stop sound fadeout 2
-    stop music fadeout 3
     play ambient 'audio/effects/schoolLoop.ogg' fadein 1.5
     scene hallway
-    with fade
+    with Dissolve(1)
 
     "As I power walk out of the classroom I swear I caught a glimpse of Reed waving goodbye."
 
@@ -1617,10 +1639,14 @@ label chapter_2:
 
     window hide
     window auto
-    pause .5
+    pause 0.25
+
+    scene black with Dissolve(1)
+    pause 0.25
 
     scene cafeteria
-    with fade
+    with Dissolve(1)
+    pause 0.25
 
     "I sprint through the school hallways, already familiar with the layout, looking for the drug dealer."
 
@@ -2580,8 +2606,6 @@ label chapter_2:
     pause .5
 
     "{cps=*.05}...{/cps}"
-    window hide
-    window auto
     pause .5
 
     return

game/script/3.showing-up-at-band-practice-and-giving-feedback.rpy

@@ -4,9 +4,11 @@ label chapter_3:
 
     # CH 3 SCENE 1 - Weapons of mass distraction
 
-    scene black with fade
-
     "{cps=*0.2}-- One Week Later --{/cps}"
+    window hide
+    window auto
+    pause 0.5
+
     play music 'audio/OST/Appreciating the Atmosphere.ogg' fadein 1
     scene classroom with Dissolve(1.5)
     pause .5
@@ -873,9 +875,12 @@ label chapter_3:
     show stella considering with Dissolve(.25)
     pause 1
 
+    scene black with Dissolve(1)
+    pause 0.5
+
     # CH 3 SCENE 4 - It's almost Shakespearean
 
-    scene bandroom with Fade(1,0,1.5)
+    scene bandroom with Dissolve(1)
     pause .5
 
     "I slam into the band room door just as the late bell trills, panting and sweaty."
@@ -1295,15 +1300,21 @@ label chapter_3:
     A "FUCK!" with vpunch
 
     F "Hurry up already."
+    window hide
+    window auto
+    pause 0.5
 
     stop music fadeout 3
+    scene black with Dissolve(1)
+    pause 0.5
+
     scene auditorium
     show reed neutral flip:
         yalign 0.1 xalign 1.6
     show trish neutral:
         yalign 0.0 xalign 0.85
     show dimmer_light behind trish, reed
-    with Fade(1, 0, 1)
+    with Dissolve(1)
     pause .5
 
     "Inside, Reed and Trish already have everything set up onstage."
@@ -2272,9 +2283,11 @@ label chapter_3:
     pause .5
 
     if persistent.lewd == True:
-       scene lesbo with Fade(0, 0, 2)
+       scene lesbo with Dissolve(2)
        pause 20.00
-       scene black with Fade(1, 0, 0)
+       scene black with Dissolve(1)
+
+    pause .5
 
     "{cps=*.2}Fuck.{/cps}"
 

game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy

@@ -92,7 +92,7 @@ label chapter_5:
     "I cast my gaze aside instead."
     pause .5
 
-    "The flower bulbs are still closed for the winter, but a few are peeking out."
+    "Most of the flower bulbs are still submerged for the winter, but a few are peeking out."
     window hide
     window auto
 

game/script/x8-naomi-tribulations.rpy

@@ -200,7 +200,7 @@ label chapter_x8:
     show naomi sad with dissolve
 
     N "I see{cps=*.15}...{/cps}"
-    show naser neckhold flip with dissolve
+    show naser brooding flip with dissolve
 
     Nas "Lucy and Anon are taking one, and I thought-"
     pause 0.5
@@ -396,16 +396,27 @@ label chapter_x8:
     show spears:
         ease_cubic 1.0 xalign 0.4
     "He gives me a warm smile and a pat on the shoulder and leaves to let me get acquainted with the new space."
+    window hide
+    window auto
+    pause 0.25
 
     show spears:
         easeout_cubic 1 xalign -0.3
     pause .4
     hide spears with dissolve
 
+    pause 0.5
+    show naomi:
+        easein_cubic 1 xalign 0.1
+    pause 0.5
+
     "Looks like there’s already a few forms to fill out{cps=*.15}...{/cps}"
     pause 0.5
 
     "Oh? There’s a letter in here, too{cps=*.15}...{/cps}"
+    window hide
+    window auto
+    pause 0.5
 
     ##fade in cg
     #this one music pops on purpose
@@ -434,7 +445,7 @@ label chapter_x8:
     "Not that anyone other than Spears would even care about-"
     pause 0.5
 
-    "{cps=*.20}...{/cps}‘Dearest Naomi..’?"
+    "{cps=*.20}...{/cps}‘Dearest Naomi{cps=*.20}...{/cps}’?"
     pause 0.5
 
     "Is this a joke? Who would{cps=*.20}...{/cps}?"
@@ -517,7 +528,7 @@ label chapter_x8:
     window auto
     pause 0.5
 
-    stop music fadeout 3
+    stop music fadeout 5.5
     scene black with Dissolve(2)
     pause 0.5
 

game/script/x9-naomi-tribulations.rpy

@@ -672,7 +672,7 @@ label chapter_x9:
     show fang:
         ease_cubic 1.5 xalign 0.3
     pause 1
-    play music1 'audio/OST/good faith leadup drums synth.ogg' fadein 2.0
+    play music1 'audio/OST/good faith leadup drums synth.ogg' fadein 4.0
     stop ambient fadeout 10
     pause 0.25
 
@@ -716,13 +716,13 @@ label chapter_x9:
     N "Should I have worked so hard when it led to where I am today?"
     pause 0.5
 
-    N "{cps=*.20}...{/cps}I{cps=*.20}...{/cps} {w=0.5}I don’t know anymore{cps=*.20}...{/cps}"
+    N "{cps=*.20}...{/cps}I {w=0.5}{cps=*.20}...{/cps}I don’t know anymore{cps=*.20}...{/cps}"
     pause 0.5
 
     N "All I know is that{cps=*.20}...{/cps}{w=0.2} aside from your brother{cps=*.20}...{/cps} {w=0.5}nothing's ever really made me happy{cps=*.20}...{/cps}"
     pause 1
 
-    N "...Nothing{cps=*.20}...{/cps}"
+    N "{cps=*.20}...{/cps}Nothing{cps=*.20}...{/cps}"
     pause 1
 
     "Against my better judgment, I kneel next to Naomi and put a hand on her shoulder."

game/storyline.rpy

@@ -70,14 +70,15 @@ image d_credits = Composite(
     (0, 10410), "d_sketch")
 
 label .ending:
-    play music "audio/OST/Dino Destiny Reader.ogg"
     call get_ending
     if _return == 4:
-        scene d_credits at Pan((0, -500),(0, 9850), 65) with fade
+        show d_credits at Pan((0, -500),(0, 9850), 65) with fade
     elif _return == 3:
-        scene c_credits at Pan((0, -500),(0, 9850), 65) with fade
+        play music "audio/OST/Dino Destiny Reader.ogg"
+        show c_credits at Pan((0, -500),(0, 9850), 65) with fade
     else:
-        scene b_credits at Pan((0, -500),(0, 9850), 65) with fade
+        play music "audio/OST/Dino Destiny Reader.ogg"
+        show b_credits at Pan((0, -500),(0, 9850), 65) with fade
     pause
     stop music fadeout 5
     scene black with Dissolve(3)
@@ -85,8 +86,11 @@ label .ending:
     if tradwife:
        scene c10 with Dissolve(1.5)
        pause 20
+       scene black with Dissolve(2)
+       pause 1
     elif anonscore >= 4 and fangscore >= 4:
        scene ending_d_cg with Dissolve(1.5)
        pause 20
-    scene black with Dissolve(2)
+       scene black with Dissolve(2)
+       pause 1
     return