From a22aa136cb62d218729c50d779c1504066324b90 Mon Sep 17 00:00:00 2001
From: Bowie <ghostofbowie@outlook.com>
Date: Sat, 26 Jun 2021 12:40:28 +0100
Subject: [PATCH] change CTC icon, add ambient sound channel, rework 'nasers a
 bro' scenes

---
 game/images/vfx/end_marker.png                | Bin 1844 -> 0 bytes
 game/images/vfx/mid_marker.png                | Bin 1844 -> 0 bytes
 game/images/vfx/pickicon.png                  | Bin 0 -> 827 bytes
 game/images/vfx/pickicon2.png                 | Bin 0 -> 2366 bytes
 game/script.rpy                               |  31 +-
 .../1.first-two-days-anon-meets-fang.rpy      | 315 +++++++++++++-----
 6 files changed, 250 insertions(+), 96 deletions(-)
 delete mode 100644 game/images/vfx/end_marker.png
 delete mode 100644 game/images/vfx/mid_marker.png
 create mode 100644 game/images/vfx/pickicon.png
 create mode 100644 game/images/vfx/pickicon2.png

diff --git a/game/images/vfx/end_marker.png b/game/images/vfx/end_marker.png
deleted file mode 100644
index fb04c85716097b95dac399c650028b7f04d4d695..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1844
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

diff --git a/game/images/vfx/mid_marker.png b/game/images/vfx/mid_marker.png
deleted file mode 100644
index fb04c85716097b95dac399c650028b7f04d4d695..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1844
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

diff --git a/game/images/vfx/pickicon.png b/game/images/vfx/pickicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..aeb64c628c97f57d7d41699354d8ecede8fc1fa8
GIT binary patch
literal 827
zcmV-B1H}A^P)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00009a7bBm000XT
z000XT0n*)m`~Uy|8+1ijbW?9;ba!ELWdK8EY;$>YAX9X8WNB|8RBvx=!KdMT0008U
zNkl<ZXx{DGUuaKZ7{KxGuZ6LcG7*~#ic!NZ+)PRq^`x<;Ni-D2(Woh%Vs|z?kw2lQ
z75UR>R%@Da3O7cxQcDq2T+N>{HL@t==jL3v(dKvFb58MlZ%&=xIp;l}&N<KfKF|Bh
zWV2cRg_g-f@{l|veu(D>1;7$uIj|U52+Rbg026`l;i2z=7r?7<+XwWU%D2=Yo*!g@
z6+k_(7MPmjJ&XYNfg3=FseDWf;`u=}&;pb@enUopD?qcUyo(Lu`9UGj3T%n_l^+In
zn@YQLi020rfLp-IgudS_&}1ryT|>?T+Y=5(S)j&Lx}88gKd1ukrW9G9n93qoke)EK
zrqwD;<#8m4=LfTZK_HVNWS^;=j0&j*I#V9F&zj1fsE|hBM9PqBrm{IIqyadSGUU3c
zY>W!213FTMoHLb%sE{(?dCHJRQ#lnCk^$ZVGg5@CHkCUr#*vG_wv-S*fMQem<N{Iy
zbfpC8HI-$qM)o3LC`^))ZcV1r;&Rg13Dl+lSzsyyE+Ol}EH26R&{Qg2Pvge{Z-8kD
zLUx$Sg*Y<Aqkx|fVi+hfl`nBXN`aTa_yiy=rqUE!@xk+h%L(M{pMg21@*z%08SoS+
zh!Jw!RQ4xP4!Q(vjqz#BHI<<xAf><nFe$A8&<P~O90HmgBVGgZOyz5mkRsq2Fxw%d
z-c;IhIWbZZJ1m`cJ3{mUm8OzS91>!#0-GWtegaEPr9amTxPTOg;dpw4%e0!xt|<56
zYJFr4aFg6>UxPsTXo*uIkPvek*qcN4S7j<aQTulZDFk|fioZDRfT<jD(ZAC*M9&ZA
z1CM~oV>rAESf6W@iWL%KHURCTd@sGgs<BSdQ-Oq-gFy2ietrN{=ekyyC?v!*0LOsB
z-*&eFJ6%4B*dZaN1gHawf!n5XFRs4we;CL^@{s=o@(TuTc&w5+pzr_y002ovPDHLk
FV1gmiXuJRb

literal 0
HcmV?d00001

diff --git a/game/images/vfx/pickicon2.png b/game/images/vfx/pickicon2.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ede2f15669e612be4993488e3df4808e112e9d2
GIT binary patch
literal 2366
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

literal 0
HcmV?d00001

diff --git a/game/script.rpy b/game/script.rpy
index 16379b7..9768872 100644
--- a/game/script.rpy
+++ b/game/script.rpy
@@ -83,15 +83,32 @@ transform randPosition:
 # Click-to-continue icons / animations
 # TODO: these are sucky placeholders and need to be graced by an artfriend
 image ctc_end_marker:
-   "end_marker"
-   xalign 0.9 yalign 0.98
-   pause 0.5
-   xalign 0.92
-   pause 0.5
+   "pickicon2"
+   xalign 0.5 yalign 0.98
+   linear 0.5 alpha 0
+   linear 0.5 alpha 1
    repeat
 image ctc_mid_marker:
-   "mid_marker"
-   xalign 1 yalign 1
+   "pickicon2"
+   xalign 0.5 yalign 0.98
+   linear 0.5 alpha 0
+   linear 0.5 alpha 1
+   repeat
+
+# image ctc_end_marker:
+#    "pickicon"
+#    xalign 0.9 yalign 0.98
+#    pause 0.5
+#    xalign 0.92
+#    pause 0.5
+#    repeat
+# image ctc_mid_marker:
+#    "pickicon"
+#    xalign 0.9 yalign 0.98
+#    pause 0.5
+#    xalign 0.92
+#    pause 0.5
+#    repeat
 
 #Characters
 define base = Character (ctc="ctc_end_marker", ctc_pause="ctc_mid_marker", ctc_timedpause=Null(), ctc_position="fixed") # try to remember some of the basics of CTC
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 4929239..9e5633a 100644
--- a/game/script/1.first-two-days-anon-meets-fang.rpy
+++ b/game/script/1.first-two-days-anon-meets-fang.rpy
@@ -1062,11 +1062,15 @@ label chapter_1:
 
     hide naser with easeoutleft
 
-    Nas "Fa-{w=0.5}{nw}"
+    pause 0.5
+
+    Nas "Fa-{w=0.6}{nw}"
 
     window hide 
     with hpunch # TODO: some crash / crack SFX would punctuate these interruptions, think AA
 
+    pause 0.7
+
     "The voice on the other end is loud and shrill." 
 
     Nas "Yeah{w=0.2} I-{w=0.5}{nw}"
@@ -1074,6 +1078,8 @@ label chapter_1:
     window hide 
     with hpunch
 
+    pause 0.7
+
     "He holds the phone away from his ear to save his eardrum."
 
     Nas "Okay okay I-"
@@ -1152,16 +1158,16 @@ label chapter_1:
 
     "I don’t know too much about music,{w=0.4} but even I know that you don’t use two basses in one band unless you know exactly what you’re doing."
 
-    "{cps=*0.4}Ooooooh nooooooo.{/cps}"
+    "{cps=*0.3}Ooooooh nooooooo.{/cps}"
 
-    "{cps=*0.5}Ooooooooh{/cps} God."
+    "{cps=*0.3}Ooooooooh{/cps} God."
 
     "What were they thinking?!{fast}" with vpunch
 
     "I looked back to the crowd to gauge their interest."
 
     "Surely I’m not alone in thinking this is an absolute travesty."
-    unknown "PFFFT AHAHAHA THEY STILL FUCKING SUCK!!"
+    unknown "{cps=*0.5}PFFFT AHAHAHA{/cps}{w=0.4} THEY STILL FUCKING SUCK!!"
 
     play ambient 'audio/effects/chatter loop.ogg' volume 1.7 fadein 2.0
     
@@ -1253,7 +1259,7 @@ label chapter_1:
 
     Sp "I don’t want to hear about any of this come tomorrow."
 
-    Sp "I expect some goddamned maturity from you,{w=0.2} Anon."
+    Sp "I expect some goddamned maturity from you,{w=0.3} Anon."
 
     Sp "You’ll be an adult once you graduate."
 
@@ -1261,9 +1267,10 @@ label chapter_1:
 
     Sp "I’ve taught many students,{w=0.4} and I can tell these things."
 
-    show anon fear flip
     show spears:
         easein_quart 1.0 xalign 0.5
+    pause 1.0
+    show anon fear flip
 
     "His hand lands on my shoulder."
 
@@ -1303,7 +1310,7 @@ label chapter_1:
     with vpunch
     
 
-    Sp "{b}WHOSE SORRY ASS AM I GOING TO HAVE TO SUPLEX!{/b}" # TODO: suitable SFX
+    Sp "{b}{cps=*0.5}WHOSE SORRY ASS AM I GOING TO HAVE TO SUPLEX!{/cps}{/b}" # TODO: suitable SFX
 
     pause 0.5
 
@@ -1431,7 +1438,6 @@ label chapter_1:
     pause 1
     scene black with fade
 
-
     # TODO: resolve accidental time warp? Anon has only been at school for a day here
     # "Opening the door blows the cool morning air in my face, and I stop to take a deep breath."
     # scene skinrow
@@ -1440,7 +1446,6 @@ label chapter_1:
     # scene outside school
     # show anon neutral at aleft
 
-
     play music 'audio/OST/Appreciating the Atmosphere.ogg'
     show outside school fog with fade
 
@@ -1456,12 +1461,14 @@ label chapter_1:
 
     "I check my clock once again -{w=0.3} I’m early.{w=0.5} Fucking hell.{w=0.6} Should have shitposted a bit more."
 
-    play music 'audio/OST/The Hunt for more (You)s.ogg' fadeout 1 fadein 1
+    stop music fadeout 1
 
     "Why am I here so early again?"
 
     "Think I had to do something."
 
+    play music 'audio/OST/The Hunt for more (You)s.ogg' fadein 1
+
     "Oh yeah."
 
     "I should talk to Naser.{w=0.5} Give him my version of events."
@@ -1488,96 +1495,165 @@ label chapter_1:
 
     label .naserBro:
 
-    "Principal caveman can wait. I want to apologize to Naser about yesterday…"
+    "Principal caveman can wait.{w=0.4} I want to apologize to Naser about yesterday{cps=*0.1}...{/cps}"
 
     "I hope I can be nice to him this time."
 
-    "Great job, Anon!"
+    "Great job,{w=0.3} Anon!"
 
-    "He saves you from soy poisoning by sacrificing his footlong, and how do you repay him? By laughing at his sister."
+    "He saves you from soy poisoning by sacrificing his footlong,{w=0.4} and how do you repay him?{w=0.6} By laughing at his sister."
 
-    "There he is, I hope he’s not too busy."
+    "There he is,{w=0.4} I hope he’s not too busy."
 
     "..."
 
     "I just realized I don’t know what to say to him"
 
-    "\"I wasn’t laughing AT your sister, I was laughing WITH the crowd\""
+    "\"I wasn’t laughing AT your sister,{w=0.4} I was laughing WITH the crowd\""
 
-    "No, that sounds bad"
+    "No,{w=0.3} that sounds bad"
 
-    "\"Weird sisters, amirite?\""
+    "\"Weird sisters,{w=0.2} amirite?\""
 
-    "I might be retarded. I just told him I’m an only son yesterday."
+    "I might be retarded.{w=0.5} I just told him I’m an only son yesterday."
 
-    "\"Can’t help it, dude. Some people just won’t amount to anything in life. Sorry.\""
+    "\"Can’t help it,{w=0.1} dude.{w=0.5} Some people just won’t amount to anything in life.{w=0.5} Sorry.\""
 
-    "This isn’t time to be edgy, Anon."
+    "This isn’t time to be edgy,{w=0.2} Anon."
 
     "As I try and fail to find some way to explain myself to Naser I also fail at actually finding Naser."
 
     "How the fuck did I even end up in the tard yard?"
 
+    window hide
 
-    play music 'audio/OST/That Monochromatic Weirdo.ogg'
+    pause 0.5
 
-    "What feels like a space decade of walking, or really just half an hour I find the crippled pteradon being accosted by a VERY pissed off purple midget."
-
-    unknown "-SAID YOU INVITED ALL THOSE ASSHOLES!" #trish
-
-    Nas "Wait, Trish, you don’t understand-!"
-
-    T "DON’T CUT ME OFF YOU GRAY PIECE OF SHIT!"
-
-    "Students are clearing out of the way, just trying to get to their classes."
+    stop music fadeout 1.0
     scene hallway with fade
-    show trish angry at tleft
-    show naser neutral flip at nright
+
+    "After what feels like a space decade of walking,{w=0.4} or really just half an hour,{w=0.4} I find the crippled pteradon being accosted by a {cps=*0.1}VERY{/cps} pissed off purple midget."
+
+    play music 'audio/OST/That Monochromatic Weirdo.ogg' fadein 0.5
+
+    # show trish angry at tleft
+    show trish angry:
+        yalign 0.1
+        linear 0.05 xalign 0.005
+        linear 0.05 xalign 0
+        repeat
+    show naser neutral flip:
+        yalign 0.1
+        xalign 1.3
+    with Dissolve(1.5)
+
+    unknown "{cps=*0.4}-SAID YOU INVITED ALL THOSE ASSHOLES!{/cps}" #trish
+
+    show naser explanatory flip
+
+    Nas "Wait,{w=0.3} Trish,{w=0.4} you don’t understand-!"
+
+    show naser 
+
+    show trish at tleft
+
+    T "DON’T CUT ME OFF YOU GRAY PIECE OF SHIT!" with vpunch
+
+    show naser unimpressed flip with dissolve
+
+    "Students are clearing out of the way,{w=0.4} just trying to get to their classes."
 
     "This must be a common occurrence."
 
-    "The diminutive triceratops, Trish, bows her head and charges Naser."
+    show trish:
+        easein_quart 0.5 xalign -0.05
+        pause 0.5
+        easein_quart 0.5 xalign -0.15
+
+    pause 1.5
+
+    "The diminutive triceratops,{w=0.4} Trish,{w=0.4} bows her head and charges Naser."
+
+    # show naser shocked flip behind trish
+    show trish fury with Dissolve(0.25):
+        yanchor 0
+        ypos 0.35
+        easeout_quart 0.6 xalign 0.4
+
+    pause 0.3
+
+    show naser shocked flip behind trish:
+        easein_quart 0.2 xalign 1.45
+    show trish:
+        easein_quart 0.2 xalign 0.5
+    with hpunch
+    
+    pause 1
 
     "He just holds a hand out to her forehead."
-    show naser shocked flip at nright behind trish with dissolve
-    show trish fury:
-        xalign 0.0 yalign 10.0
-    show trish fury with move:
-        xalign 0.75 yalign 10.0
 
-    T "GET YOUR HANDS OFF ME!!"
+    # 0.5
+    show trish:
+        easeout_quart 0.4 xalign 0.525
+        pause 0.2
+        easeout_quart 0.4 xalign 0.55
+        pause 0.3
+        linear 0.3 xalign 0.49
+        pause 0.4
+        repeat
+    # 1.45
+    show naser:
+        easeout_quart 0.4 xalign 1.475
+        pause 0.2
+        easeout_quart 0.4 xalign 1.5
+        pause 0.3
+        linear 0.3 xalign 1.4
+        pause 0.4
+        repeat
 
-    Nas "Trish, I’m not going to fight you again."
+    T "GET YOUR HANDS OFF ME!!" with vpunch
+
+    Nas "Trish,{w=0.2} I’m not going to fight you again."
 
     Nas "The principal’s already gotten onto me about the lockers from last time."
 
-    Nas "Believe me, I had no idea the concert would have turned out like that."
+    Nas "Believe me,{w=0.3} I had no idea the concert would have turned out like that."
 
-    T "LIAR!!"
+    T "{b}LIAR!!{/b}" with vpunch
 
     Nas "I just wanted to make sure you guys had an actual audience-"
 
     T "WHAT ARE YOU SAYING?!?"
 
-    Nas "You know what I mean, come on..."
+    Nas "You know what I mean,{w=0.4} come on{cps=*0.1}...{/cps}"
 
     T "Argh!"
 
-    show trish angry at ncenter with dissolve
+    show trish angry at tcenter with Dissolve(.25)
+    show naser:
+        xalign 1.6
+    with ease
 
     "She stops trying to gore Naser and throws her arms to her sides."
 
-    show naser unimpressed flip with dissolve
+    pause 0.5
+
+    show trish:
+        easein_quart 1.0 xalign 0.4
 
     T "Screw you!"
 
+    show naser neutral flip with Dissolve(.25)
+
     T "Even if you weren’t trying to mess with Fang!"
 
-    T "Screw! You!"
+    T "Screw!{w=0.4} You!"
 
     "She stomps off."
 
-    hide trish with moveoutright
+    stop music fadeout 1.5
+    play ambient 'audio/effects/school loop.ogg' fadein 1.5
+    hide trish with Dissolve(1.5)
 
     show naser annoyed flip with dissolve
 
@@ -1586,114 +1662,175 @@ label chapter_1:
     show anon neutral at aleft with dissolve
     A "What was that all about?"
 
-    show naomi neutral flip with moveinright:
+    show naomi considering flip behind naser with easeinright:
          xalign 0.6
 
-    N "Oh, Anon."
+    N "Oh,{w=0.3} Anon."
 
-    N "Don’t worry about it, it’s nothing."
+    show naomi neutral flip
 
-    Nas "Y’know, girl issues, right? Haha..."
+    N "Don’t worry about it,{w=0.3} it’s nothing."
 
-    show naser sad flip with dissolve
+    show naomi explanatory flip
 
-    A "Sure…"
+    Nas "Y’know,{w=0.5} girl issues,{w=0.2} right?{w=0.5} {cps=*0.15}Haha...{/cps}"
+
+    show naomi neutral flip
+    show naser sad flip 
+    with dissolve
+
+    A "{cps=*0.4}Sure...{/cps}"
 
     A "Sounds like she was grilling you about the concert."
 
-    Nas "..."
+    Nas "{cps=*0.1}...{/cps}"
 
-    N "Some concert, right?"
+    show naomi explanatory flip
 
-    A "Actually, about that…"
+    N "Some concert,{w=0.3} right?"
 
-    A "I, uhh…"
+    show naomi neutral flip
 
-    #play sound "audio/PANoise.ogg"
-    pause 1
-    Sp "ANON MOUS, IF YOU ARE NOT IN MY OFFICE WITHIN TEN MINUTES I SWEAR ON MY DEAR FAMILY I WILL PERSONALLY MOUNT YOU ON MY WALL."
-    #play sound "audio/PANoise.ogg"
+    A "Actually,{w=0.5} about that{cps=*0.1}...{/cps}"
+
+    A "I,{w=0.3} uhh{cps=*0.1}...{/cps}"
+
+    #TODO: play sound "audio/PANoise.ogg"
     pause 1
 
-    A "..."
+    show naomi shocked flip
+
+    Sp "ANON MOUS,{w=0.4} IF YOU ARE NOT IN MY OFFICE WITHIN TEN MINUTES I SWEAR ON MY DEAR FAMILY I WILL PERSONALLY MOUNT YOU ON MY WALL." with vpunch
+    #TODO: play sound "audio/PANoise.ogg"
+
+    pause 1
+
+    show naomi neutral flip with dissolve
+
+    A "{cps=*0.1}..."
 
     "A layer of cold sweat makes its presence known."
 
-    show naser neutral with dissolve
+    show naser considering
+    with dissolve 
 
-    Nas "It can wait, the office is down this hall on the right."
+    Nas "It can wait,{w=0.5} the office is down this hall on the right."
 
-    A "I know the way, but thanks."
+    A "I know the way,{w=0.3} but thanks."
 
     "Naser waves and heads off."
 
-    hide naomi with moveoutleft
+    hide naser
+    hide naomi
+    with Dissolve(1.0)
 
-    "Guess it’s to the principal’s office with me. Again."
+    "Guess it’s to the principal’s office with me.{w=0.3} Again."
 
     "And thinking about him makes me think about last night."
 
-    Sp "{i}You are not the only person in the world.{/i}"
+    Sp "{cps=*0.6}{i}You are not the only person in the world.{/i}{/cps}"
 
-    "Poor Naser, man. Just wanted to help his sister."
+    "Poor Naser,{w=0.3} man.{w=0.5} Just wanted to help his sister."
 
     "But it’s not like he did anything wrong."
 
     scene hallway
-    show naomi angry at scenter
-    show reed explanatory flip at rright
+    show naomi unimpressed at sleft
+    show reed neutral flip behind naomi:
+        yalign 0.1 xalign 1.2
     with fade
+
     "Just as I reach the office the sound of clinking glass draws my attention to the apricot asspain and some pink raptor."
 
-    N "Is that contraband, Reed?"
+    show naomi angry with Dissolve(0.25)
 
-    Re "Bro, you’ve known I’m in a band for like, a year now."
+    N "Is that contraband,{w=0.3} Reed?"
 
-    N "No! Contraband! In your backpack!"
+    show naomi unimpressed with Dissolve(.25)
+    show reed explanatory flip
 
-    Re "Hmmm… nah, I left my games at home."
+    Re "Bro,{w=0.4} you’ve known I’m in a band for like,{w=0.4} a year now."
 
-    "Naomi facepalms, or whatever counts as a facepalm with a snout."
+    show reed neutral flip
+    show naomi angry:
+        easein 0.25 xalign 0.1
+    pause 0.25
 
-    N "Reed! You have a bong in your backpack!"
+    N "No!{w=0.5} Contraband!{w=0.5} In your backpack!"
 
-    Re "...But we aren’t in Britain?"
+    Re "{cps=*0.2}Hmmm...{/cps}{w=0.4}{nw}"
+    show reed explanatory flip
+    Re "Hmmm...{fast} nah, I left my games at home."
 
-    N "Ugh, you’re impossible…"
+    show reed neutral flip
+    show naomi unimpressed with dissolve
 
-    hide naomi with moveoutright
+    "Naomi facepalms,{w=0.4} or whatever counts as a facepalm with a snout."
+
+    show naomi angry:
+        easein .25 xalign 0.45
+
+    N "Reed!{fast}{w=0.7} You have a bong in your backpack!" with vpunch
+
+    Re "{cps=*0.1}...{/cps}But we aren’t in Britain?"
+
+    show naomi unimpressed with Dissolve(.25)
+
+    N "Ugh,{w=0.3} you’re impossible{cps=*0.1}...{/cps}"
+
+    show naomi unimpressed with Dissolve(.25)
+    # hide naomi with easeoutright
+    hide naomi with Dissolve(1)
 
     "Naomi huffs and returns her focus to a stack of papers on the desk, leaving a satisfied raptor in her wake."
 
-    show reed happy flip with dissolve
+    show reed happy flip with Dissolve(.25)
 
-    Re "Heh, works every time…"
+    Re "Heh,{w=0.4} works every time{cps=*.1}...{/cps}"
 
     "I need to learn how to do that."
 
-    Re "S’all ‘bout misdirection…"
+    show reed neutral flip with dissolve
+
+    Re "S’all ‘bout misdirection{cps=*.1}...{/cps}"
 
     "What."
 
+    show reed happy flip with Dissolve(.25)
+
     Re "Deuces."
 
-    hide reed with moveoutright
+    hide reed with easeoutright
+
+    pause 1.5
 
     "The fuck just happened?"
 
-    show naomi neutral flip at scenter with dissolve
+    window hide
+    pause 0.5
 
-    N "Oh! Anon, I didn’t see you there!"
+    show naomi neutral flip at scenter 
+    with Dissolve(1.0)
+
+    show naomi explanatory flip
+
+    N "Oh!{w=0.5} Anon,{w=0.3} I didn’t see you there!"
+
+    show naomi neutral flip
 
     N "Just in time to finish your paperwork!"
 
     A "Paperwhatsit now?"
 
-    N "Go inside, Principal Spears will finalize it with you now."
+    show naomi explanatory flip
 
-    "Paperwork? What fucking paperwork? I’m pretty sure all that stuff was finished before I even came here."
+    N "Go inside,{w=0.4} Principal Spears will finalize it with you now."
 
-    "Whatever. Probably a detention slip or whatever the principal has planned."
+    show naomi neutral flip
+
+    "Paperwork?{w=0.5} What fucking paperwork?{w=0.5} I’m pretty sure all that stuff was finished before I even came here."
+
+    "Whatever.{w=0.6} Probably a detention slip or whatever the principal has planned."
 
     scene office spears with dissolve