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

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

@@ -1186,7 +1186,6 @@ label chapter_13A:
     window auto
     pause .5
 
-    play music 'audio/ost/summertime synth.ogg' fadein 2
     scene auditorium
     show dimmer_darker
     show dimmer_darker as dimmer_xtra

game/script/4.anon-needs-help-during-music-period.rpy

@@ -111,9 +111,9 @@ label chapter_4:
 
     show naomi considering with Dissolve(.25)
     N "Sorry, but I did help Anon pick his electives."
-    pause .5
 
-    "Why did I ever agree to padding out my credits with a new subject, I should have taken pre-ancient history or some shit."
+    "Why did I agree to padding out my credits with a new subject, I never thought I'd live to regret zoning her out."
+    pause .5
 
     "Naomi places a finger on her chin{w=.15}(?){w=.15} for a moment and stares into space."
 
@@ -709,7 +709,7 @@ label chapter_4:
 
     F "How’d you even join this class?"
 
-    A "Only elective that had an open spot. Even though it’s mid semester and I’m expected to be at the level of everyone that’s been here all year."
+    A "Only elective that had an open spot, apparently. Even though it’s mid semester and I’m expected to be at the level of everyone that’s been here all year."
 
     show fang considering flip with Dissolve(.25)
     "Fang leans her head down and holds her hand on top of her muzzle."

game/script/6.anon-helps-fang-find-a-venue-for-band.rpy

@@ -1625,14 +1625,9 @@ label chapter_6:
     "{i}Fuck{/i}, how didn’t I notice?"
     pause .5
 
-    # TODO: as above
-    "{alpha=0.75}{i}Naomi places a finger on her chin(?) for a moment and stares into space. Suddenly, her face lights up.{/i}{/alpha}"
+    N "{alpha=0.75}{i}\"Sorry, but I did help Anon pick his electives.\"{/i}{/alpha}"
 
     N "{alpha=0.75}{i}\"Oh! What if you asked Fang for help?{w=.4} I’m sure she’d lend a hand!\"{/i}{/alpha}"
-
-    A "{alpha=0.75}{i}\"I dunno{cps=*.1}...{/cps} she’s usually busy with her own work, and I don’t want to bother her more than I already do every day.\"{/i}{/alpha}"
-
-    N "{alpha=0.75}{i}\"It can’t hurt to ask, though, right?{w=.4} Just a thought.\"{/i}{/alpha}"
     pause .5
 
     "{cps=*.3}That fucking{/cps}{w=.2} {i}bitch{/i}."
@@ -1641,9 +1636,13 @@ label chapter_6:
     # TODO: added from script doc, check if this is a flashback line or not
     # N "I figured you two would be perfect for one another."
 
-    "This entire time she’s been pushing me closer to Fang."
+    Sp "{alpha=0.75}{i}\"You can thank Naomi that you got off with campus beautification.\"{/i}{/alpha}"
+
+    Sp "{alpha=0.75}{i}\"She was quite adamant that it would be more constructive than homeroom detention.\"{/i}{/alpha}"
     pause .5
 
+    "This entire time she’s been pushing me closer to Fang."
+
     "I must be the biggest fucking idiot."
     pause .5
 

game/script/9.anons'-dirty-laundry-gets-put-up-to-air.rpy

@@ -46,9 +46,9 @@ label chapter_9:
 
     show naomi:
         easein_cubic 1.5 xalign 0.3
-    show anon neutral with dissolve:
-        xalign 1.0 yalign 0.1
-        easein_cubic 1.5 xalign 0.75
+    show anon neutral behind naomi with dissolve:
+        xalign -0.3 yalign 0.1 #xalign 1.0
+        easein_cubic 1.85 xalign 0.75
     pause 1
 
     "Naomi has taken the opportunity to walk with me through the hallways."
@@ -562,8 +562,12 @@ label chapter_9:
         parallel:
             pause .25
             linear 0.5 alpha 0
-    pause .5
-    show reed considering flip:
+    pause .25
+    show reed considering:
+        xalign 1.05 
+    with Dissolve(0.2)
+    pause .2
+    show reed: #flip
         parallel:
             easeout_back 0.75 xcenter 1.4
         parallel:

game/script/x10-raymbas-observations.rpy

@@ -809,7 +809,7 @@ label chapter_x10:
 
     stop music fadeout 6
     F "{cps=*.1}...{/cps}Bitch{cps=*.1}...{/cps}"
-    show fang pneutral blur flip with Dissolve(1)
+    show fang pneutral blur flip with Dissolve(1.0)
 
     "Unknown guest designation confirmed."
     window hide