merge both routes through Spear's office into one with the appropriate dialogue variation, rework Spear's office scene

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

@@ -1067,7 +1067,7 @@ label chapter_1:
     Nas "Fa-{w=0.6}{nw}"
 
     window hide 
-    with hpunch # TODO: some crash / crack SFX would punctuate these interruptions, think AA
+    with hpunch # TODO: some slapstick SFX would punctuate these interruptions
 
     pause 0.7
 
@@ -1489,10 +1489,14 @@ label chapter_1:
 
     menu:
         "Naser's a bro":
+            # affects dialogue with Spears when entering his office
+            $ late_to_spears = True
             jump .naserBro
         "I don't wanna piss off the caveman.":
+            $ late_to_spears = False
             jump .pissOffCaveman
 
+    # Anon tries to find Naser before heading to Spear's office
     label .naserBro:
 
     "Principal caveman can wait.{w=0.4} I want to apologize to Naser about yesterday{cps=*0.1}...{/cps}"
@@ -1782,11 +1786,11 @@ label chapter_1:
     # 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."
+    "Naomi huffs and returns her focus to a stack of papers on the desk,{w=0.4} leaving a satisfied raptor in her wake."
 
     show reed happy flip with Dissolve(.25)
 
-    Re "Heh,{w=0.4} works every time{cps=*.1}...{/cps}"
+    Re "Heh,{w=0.4} {cps=*.5}works every time{/cps}{cps=*.1}...{/cps}"
 
     "I need to learn how to do that."
 
@@ -1816,10 +1820,12 @@ label chapter_1:
 
     N "Oh!{w=0.5} Anon,{w=0.3} I didn’t see you there!"
 
-    show naomi neutral flip
+    show naomi happy flip with Dissolve(.25)
 
     N "Just in time to finish your paperwork!"
 
+    show naomi neutral flip with Dissolve(.25)
+
     A "Paperwhatsit now?"
 
     show naomi explanatory flip
@@ -1832,147 +1838,11 @@ label chapter_1:
 
     "Whatever.{w=0.6} Probably a detention slip or whatever the principal has planned."
 
-    scene office spears with dissolve
+    stop ambient fadeout 1
 
-    "I open the door to the cramped office, expecting to see a gruff cave of a workspace."
+    # Branch joins up again at Spear's office, with some small dialogue differences
+    jump .spears_office
 
-    "Instead, it was a fairly well furnished space complete with armchairs and cabinets of old photos."
-
-    show spears neutral flip at sright with dissolve
-
-    Sp "You going to stand there forever? What are you waiting for? Sit."
-
-    show anon neutral at aleft with moveinleft
-
-    "I plant myself in one of the armchairs and sink a bit lower into the cushion than expected."
-
-    "Perks of being a human, I guess."
-
-    Sp "I believe I told you last night to be here first thing this morning."
-
-    "Shit!"
-
-    Sp "Tell me, do I have a stutter?"
-
-    A "..."
-
-    Sp "Speak."
-
-    A "N-no, sir."
-
-    Sp "{i}*sigh…*{/i}"
-
-    Sp "Take this as a learning experience, Anon."
-
-    Sp "Punctuality gets you far in life."
-
-    A "Yes, sir."
-
-    Sp "I let you off the hook last night because you’re a new student."
-
-    Sp "I meant what I said last night."
-
-    "Hopefully not about the whole pile driving thing."
-
-    Sp "Still, I didn’t bring you in here to lecture you."
-
-    "He didn’t?"
-
-    Sp "Not many people have to use the school’s financial services."
-
-    A "What?"
-
-    A "Financial services?"
-
-    Sp "All the paperwork’s done to get you a special lunch card for the semester."
-
-    Sp "You don’t have to worry about paying until after graduation. No interest, no down payments, none of that."
-
-    A "I uh… What’s happening, sir?"
-
-    Sp "You signed up for the financial services, correct?"
-
-    Sp "Naomi told me you needed help with food and even had the papers filed out."
-
-    "Naomi?!"
-
-    Sp "Allow me to double-check real fast."
-
-    Sp "NAOMI!!"
-
-    show naomi neutral at rleft behind spears with dissolve
-
-
-    play music 'audio/effects/Alarm.ogg'
-
-    "Hello tinnitus my old friend…"
-
-    N "...."
-
-    Sp "....."
-
-    "Oh god am I stuck like this?"
-
-    Sp "-dismissed Naomi. And just to be absolutely clear, Anon did ask you for this, correct?"
-
-    N "Well, he {i}is{/i} in need of assistance, right?"
-
-    N "Otherwise he’s stuck with the budget meals."
-
-    Sp "Anon?"
-
-    "I glance between the two."
-    "It probably wasn’t malicious, but still…"
-
-    "I’m not getting involved in office politics today."
-
-    A "... Yes."
-
-    N "Oh, lovely!"
-
-    N "Don’t hesitate to ask if you have any other prob-"
-
-    Sp "You may leave now, Naomi."
-
-    N "Oh! Yes sir!"
-    hide naomi with dissolve
-    "She leaves the office and Spears clicks the papers on his desk into a stack."
-
-    Sp "Hate to do that, but she goes on for ages."
-
-    Sp "Anyways, go ahead and sign here. Here. Here. Initial here. Date here. Print your name here."
-
-    "I didn’t catch any of that."
-
-    A "W-what?"
-
-    Sp "Just kidding. You’re good to go, Anon, and don’t forget this."
-
-    "He holds out the poorly laminated lunch card for me to take."
-
-    Sp "Just keep in mind,"
-
-    Sp "As a senior, this semester is your last, your biggest chance to figure your future out."
-
-    Sp "Even if you’re new to all of us here at Volcano High, we’re here to help you make the most of it."
-
-    "Huh…"
-
-    A "Thank you, Mister Spears."
-
-    "Mr. Spears nods and gives a small smile."
-
-    Sp "You can come in anytime. I’m always here to listen. Except for topics relating to estrus season."
-
-    "I sense great exhaustion in that last bit."
-
-    "I thank Mr. Spears one last time and head to homeroom."
-
-    "..."
-
-    scene black with fade
-
-    jump postCavemanConference
 
     label .pissOffCaveman:
     "Probably best I try and not make the principal pissed at me."
@@ -2062,23 +1932,53 @@ label chapter_1:
 
     A "Sure, thanks."
 
-    scene office spears with fade
 
+    label .spears_office:
+    scene office spears with fade
 
     play music 'audio/OST/we just turned on the microphone in our programmers_ house.ogg'
 
-    "I open the door to the cramped office, expecting to see a gruff cave of a workspace."
+    "I open the door to the cramped office,{w=0.2} expecting to see a gruff cave of a workspace."
 
-    "Instead, it was a fairly well furnished space complete with armchairs and cabinets of old photos."
+    "Instead,{w=0.35} it was a fairly well furnished space complete with armchairs and cabinets of old photos."
 
     show spears neutral flip at sright with dissolve
 
-    Sp "You going to stand there forever? What are you waiting for? Sit."
+    Sp "You going to stand there forever?{w=0.4} What are you waiting for?{w=0.5} Sit."
+
+    show anon neutral at aleft with dissolve
 
     "I plant myself in one of the armchairs and sink a bit lower into the cushion than expected."
 
     "Perks of being a human, I guess."
 
+    if late_to_spears:
+
+        Sp "I believe I told you last night to be here first thing this morning."
+
+        "Shit!"
+
+        Sp "Tell me, do I have a stutter?"
+
+        A "..."
+
+        Sp "Speak."
+
+        A "N-no, sir."
+
+        Sp "{i}*sigh…*{/i}"
+
+        Sp "Take this as a learning experience, Anon."
+
+        Sp "Punctuality gets you far in life."
+
+        A "Yes, sir."
+
+        Sp "I let you off the hook last night because you’re a new student."
+
+        Sp "I meant what I said last night."
+
+    else:
         Sp "Punctual like I asked. I like that, Anon."
 
         Sp "I trust that what happened last night won’t become a recurring problem with you?"
@@ -2113,77 +2013,137 @@ label chapter_1:
 
     Sp "Allow me to double-check real fast."
 
-    Sp "NAOMI!!"
+    pause 0.75
 
-    show naomi neutral at rleft behind spears with dissolve
+    stop music 
+    play ambient '<from 0.1 to 0.7>audio/effects/tinnitus.wav' fadein 4 volume 0.25
 
-    "Hello tinnitus my old friend…"
+    Sp "NAOMI!!" with vpunch
 
-    N "...."
+    pause 0.5
 
-    Sp "....."
+    show naomi neutral at rleft zorder 1 with easeinleft
+
+    pause 1.25
+
+    "Hello tinnitus my old friend{cps=*0.1}...{/cps}"
+
+    show naomi explanatory
+
+    N "{cps=*0.2}...{/cps}"
+
+    show naomi neutral
+
+    Sp "{cps=*0.2}......{/cps}"
+
+    show naomi considering
+
+    N "{cps=*0.2}....{/cps}"
+
+    show naomi neutral
+
+    Sp "{cps=*0.2}.....{/cps}"
 
     "Oh god am I stuck like this?"
 
-    Sp "-dismissed Naomi. And just to be absolutely clear, Anon did ask you for this, correct?"
+    stop ambient fadeout 1
+    play music 'audio/OST/we just turned on the microphone in our programmers_ house.ogg' fadein 2
 
-    N "Well, he {i}is{/i} in need of assistance, right?"
+    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?"
+
+    show naomi explanatory
+
+    N "Well,{w=0.4} he {i}is{/i} in need of assistance,{w=0.2} right?"
 
     N "Otherwise he’s stuck with the budget meals."
 
+    show naomi neutral
+
+    pause 0.5
+
     Sp "Anon?"
 
     "I glance between the two."
 
-    "It probably wasn’t malicious, but still…"
+    "It probably wasn’t malicious,{w=0.3} but still{cps=*0.1}...{/cps}"
 
     "I’m not getting involved in office politics today."
 
-    A "... Yes."
+    A "{cps=*0.1}...{/cps} Yes."
 
-    N "Oh, lovely!"
+    show naomi happy with Dissolve(.25)
 
-    N "Don’t hesitate to ask if you have any other prob-"
+    N "Oh,{w=0.2} lovely!"
 
-    Sp "You may leave now, Naomi."
+    N "{cps=*0.5}Don’t hesitate to ask if you have any other prob-{/cps}{nw}"
 
-    N "Oh! Yes sir!"
+    Sp "You may leave now,{w=0.2} Naomi."
 
-    hide naomi with dissolve
+    show naomi neutral with Dissolve(.25)
+
+    N "Oh!{w=0.2} Yes sir!"
+
+    hide naomi with Dissolve(1)
     "She leaves the office and Spears clicks the papers on his desk into a stack."
 
-    Sp "Hate to do that, but she goes on for ages."
+    Sp "Hate to do that,{w=0.4} but she goes on for ages."
 
-    Sp "Anyways, go ahead and sign here. Here. Here. Initial here. Date here. Print your name here."
+    Sp "Anyways,{w=0.3} go ahead and sign here.{w=0.4} Here.{w=0.4} Here.{w=0.4} Initial here.{w=0.4} Date here.{w=0.4} Print your name here."
 
     "I didn’t catch any of that."
 
-    A "W-what?"
+    A "W{w=0.1}-what?"
 
-    Sp "Just kidding. You’re good to go, Anon, and don’t forget this."
+    Sp "Just kidding.{w=0.4} You’re good to go,{w=0.2} Anon,{w=0.4} and don’t forget this."
 
     "He holds out the poorly laminated lunch card for me to take."
 
     Sp "Just keep in mind,"
 
-    Sp "As a senior, this semester is your last, your biggest chance to figure your future out."
+    Sp "As a senior,{w=0.3} this semester is your last,{w=0.4} your biggest chance to figure your future out."
 
-    Sp "Even if you’re new to all of us here at Volcano High, we’re here to help you make the most of it."
+    Sp "Even if you’re new to all of us here at Volcano High,{w=0.4} we’re here to help you make the most of it."
 
-    "Huh…"
+    "Huh{cps=*.1}...{/cps}"
 
-    A "Thank you, Mister Spears."
+    A "Thank you,{w=0.2} Mister Spears."
+
+    show spears happy flip
 
     "Mr. Spears nods and gives a small smile."
 
-    Sp "You can come in anytime. I’m always here to listen. Except for topics relating to estrus season."
+    Sp "You can come in anytime.{w=0.5} I’m always here to listen."
+
+    show spears neutral flip
+
+    Sp "You can come in anytime. I’m always here to listen.{fast} Except for topics relating to estrus season."
 
     "I sense great exhaustion in that last bit."
 
-    stop music
+    if late_to_spears:
-    scene hallway
+        "I thank Mr. Spears one last time and head to homeroom."
+
+        "..."
+
+        stop music fadeout 1
+
+        scene black with fade
+
+        jump .postCavemanConference
+    else:
         "I thank Mr. Spears one last time and head out."
 
+        stop music fadeout 1
+        
+        scene black with fade
+
+        jump .finding_naser
+
+
+    label .finding_naser:
+    
+    scene hallway with Dissolve(1.5)
+
     "Naser should be around here somewhere, I wanted to talk to him before class."
 
     "There’s still a bit of time before the bell."
@@ -2308,10 +2268,10 @@ label chapter_1:
 
     "..."
     scene black with fade
-    jump postCavemanConference
+    jump .postCavemanConference
 
 
-    label postCavemanConference:
+    label .postCavemanConference:
 
     "The periods pass and eventually it’s lunchtime again."