From 70f546d32cb8774aa312ae0f89bc52b93cfb91b4 Mon Sep 17 00:00:00 2001
From: Bowie <ghostofbowie@outlook.com>
Date: Sat, 21 Aug 2021 22:42:35 +0100
Subject: [PATCH] rework ch11 April first opening

---
 game/images/other/pocky.png                   | Bin 0 -> 2897 bytes
 .../11.school-assignment-and-route-lock.rpy   | 229 ++++++++++++++++--
 2 files changed, 207 insertions(+), 22 deletions(-)
 create mode 100644 game/images/other/pocky.png

diff --git a/game/images/other/pocky.png b/game/images/other/pocky.png
new file mode 100644
index 0000000000000000000000000000000000000000..41432ec1acfe3efd5dca9d376ebf6a9560b9b177
GIT binary patch
literal 2897
zcmV-X3$FBuP)<h;3K|Lk000e1NJLTq008;`000UI1^@s6oqj_k0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>8^(9IPNBlA$_T5G~>;RV;#q(pG5I!Q|2}Xws0h
zxHt-~1qVMCs}3&Cx;nTDg5U>;o12rOi<J1kq|hS9gX4a@yZ5+z2MEmyQ_Y@9K-FqS
zDjpNFxmD5k3O@!B#3-T?GxbDzF$34}bq^0;?;<?Q{oJ1;sN_usctqkkrW-Zl4dR*2
zn$CHjIK)blLVQj<VbBGMAGt0&{KmOxv%oV$MkX~+93mErT`YGoD;X+rlsK%Y8s!UF
zhZW9SoYhL5weQJa7|3fYX|B^8K^#j+APEsN>L{av8X~l6q?kz2e$2%`Z2ObslF3yD
zBgX=&P$AiV@IUz7ty!3!a*_fup!dbHKE?pwF3@UN*7vbxwN3!<GjOGK{M9Bf`$>AE
zqlJ%v{%zpmx}(W^z~v4w^rTCMWJ_L}LZJY>pV2qvfPq_}Z_Vkgy^qreAVXa(-v9@P
zz<80e*InN2@9yp2GwuF<0K#!{$8SpScmMzZ24YJ`L;(K){{a7>y{D4^000SaNLh0L
z04^f{04^f|c%?sf00007bV*G`2jvJA4Jjit6R|e{000?uMObu0Z*6U5Zgc=ca%Ew3
zWn>_CX>@2HM@dakSAh-}000RnNkl<ZXx{BwO{*nG8GfF(`kZs`%}i!8W5gjOASehi
zLEVUm8^N6r#J}JV$WmMg?)(9|5ETD_OIO*r2+1NuBN8-ULX2^Am@wnaow;-F>8|&2
zQB~d5ALrg7%tFZ2UEJ>K?yC3mc|Yn9dA#xFONUp{K66F)uC2X0@E9-C;}dWNCjrO}
zF34Px%OFAyPy!v00}uo^L89CN8Q_2fz#~j1cYsb&ZtfHWFntTTAOYqiWiEF@031wv
z0p<?LAa_wlI2?k(0m#7ejSO;u0;xo&MA9i!G*d7WE$Ei5b;GC-pfyZy+`IksM|ZpL
z9=Ezi@d#3r=));U=6ge8jO7}DGhb9g^Qqaq2*?aZ&;^JDx+qrf`#EbMiult<8{F8M
znAXe>1py!^0f}TL>IvX0m!p62^E()Y#)$Pn+SWuz5D0-XBvAq<TY1|GZD)A<UmINC
z5}s*!_E31?nJq%lUjBDG!^vsr`8n7)HtPuP=kuZFcdhBcX~0Qq@<_M~QI?e=K$(9g
zD^rm?ATdfZNPt5C2}lkQgmAP1F06rrgNRKNJp>^bASKq^4Nkfo?A)-6MC%5RrZ&=d
zp6}h@PKXj6asw!$2oRJA!ogm5c~W#jS!XgrkdXgqfP{|1$;$lSPpsoV+;RN7AHABE
z1%MC#@`D$j;^{9BgTH9-O`bPGNrT2-oc;Ee)IyiaH2}y7Ge;r^8pus+(1g6E;K@bk
zgB>WDy2hF$EURUYu`k~%3DO)r8_DLAe|q|_Xr>MnC{c_ZaCo!B(d*mWcC&T*cx@6I
ztjh_R`s;qsp~_EHOfq|4wlA=kP=>>r5eZ!fL<eYT=U{VYyH@CSLTHG#TcPW$Y?BNz
z@1cHG^n@tWe00=ey^2U?mSEA7v5%QgUXfNI(YD0BlNCG?pm4B`*sQx`kXGDeq9!r%
zQ%_ofyD^o$IKcu0&_Mo}HZ2=OP5bP5=A&k>UcKDZ+mSlc08#YLLH5gg6Uu8bxmwYT
z3SFvcFLUC+tWUR=n|Lbn{m$*zJFI^Ds~^6$<=bz*^yHTgPhV;1-^AlF8h6p)bve51
zp%r9R&Wg$eOYB5;V2w<NC=N2WzG2P5q{<pXkBODZ3_C^%ojV#cG}(ieEo<aCQ>&Y-
zEhuxQ*&@Y#GsyWEoQ}I4T8~&;gT^=mu<R{hwQjmI6w{V~PM%*S))vt04fz^5$`UU_
zm{Nb+({9W8f+pZ3bHHu<)HDKk&mbx0{0V|*TCB%<P12EC-^Ff{ft7cC4{T96=v4Zw
zxZMU@|KzQIhF>(-n(iA7{cDfidOi-}XaICYsI>=i?s6li=lFWCZ;qX9;(YTx(x2_6
zk}v`*3;P`!c!+1*$H@rDrteb|K@hmSK70hy=NTyV2!~DnpEtro&i#Lk0|`I9d|~(3
z#scgdbNI}T6&zo-4c^rbJ7F=}O>2eLV~@o9ib^9F9a9hCo1dMb$0B$XgLv|p3#;dw
z`yD<w*luqL_=43YOZK&hl&&Stz|gI)pNCv_+AXn3L@G4~OWi(IEc+yx%&C!`9hL~?
zw72dhjPmA*C-Hn2Gvc|p#T6P}*&gG1+m7Rn<u+obEk@zi9f$jVb0vT#5TCnBG`WLl
z06G_<=LQ)wh*+)<bFFK+wk4RGV=2~miU1u!xso*>*TW-)RWh@QK1zh{B}c$gT3i@m
zf5~1;gANkF$x`#q7yuZy-4<qs6&sxD6fp`b3kWm_gv-&%VKfkijR_G3W9f8i5&l?G
z=hAwlz)?29K8xx*6E=~_EQeXxi<%W^sIsgf`yYIv$j-7neNWP${EhnSPm}FTXd9H2
zC=IUW^plUT-|vop1D(Ds@Mv%YL47lM5J2kAv2rR6O%QS-pSo80wCNkpX|3!@$M#B=
zXQYK(R76YSlkHV}tXNt5VEK~ZVs3&Bo7MnERL%t8_@2Wo_RX!aQJpOT+M@#dWgvPe
zi5D5{sc-udg@SyT^Qsl-BHGSi6hcUW#Hi7JsR=o5T5>^7`x67s-<{2|RK}IF=Rh-J
zd^sR+>B&CK=$p=CA30OsOZs21ndz2H&Ae{AYu+OO{Pz#fZ`ucUzYWFjldG=}eN8fx
zl&?{slNoHO!E-FX&++?U22e{5&-AW|sjZ9IH>nrNey^$-*{_*2pPxxo>WFY6oBDq*
znV55xEEqOqEh|XC-%l>C-o5iwb7M#Ttrb2j&6jL+tU71{v2BHuj^oW(3w=z4K{#3o
zn}#@PQ$)9vMD&r2nfoEKRqITi#jLVa5e$Vz@yF6w=FGS`%6?d9Kh-y?nrEYqMP=o+
zRGByCq%ruQ1$G^Av=(kXAa0!+F0LG#AUtRrTwFVLF0`J4&7}=-IhXv=fn5X|6GA{b
z-l{W+O#hJM`G_Ab^i^a6Jw@NDQQkZJICg2)Pg!)#vWN{wm}dbshmQGv2Uqo7;b(#}
z=@fZ}G#}hKS$$`;*3I8PXIvjPA)O?GGPuRWu!rnhL+;0N9$C=IYYL3y&`FlOD1l;1
zFIoInLOSeD=$=r{$eh<RLsL3;D2c6r09uTQF*5G9^g1sc^e}RIy7-nq&0}BF;JmnY
zzHrHTh``_=<@`@;_VS+(zWPqb?{(m%Ts&kjVFo&}IztBmql*-)o`<X?`5M#1EM5XM
zOUH{jcFo_Lw2Vg22Ea}4C@^2EHYvmMx;?-aeoFGa^c`#37v}cRTL&J(HI0I22C>>X
z2e&KXg%8`(;OL|P(-eP9A}gn!2jwa+o~6!O%9Xe;gB<zjoRmdiQIEwOe#KD{%5<pU
zB<>sW#|sU9cI9yO>f^r88ROZXf6I)d$<Vk%v>^iITt*m5Lv!uzQ(!o3t9lp77eYRU
z8J#wr-;&~D`zqAONClUWf7>*-QT9%d4t`wI<Aw7piD}B7j}S@k&xzRw99JL+QA~(0
zOPMsyXpD%UXv&4OQfiRiCAh-MTC{M$DmrZp=!tPL5D*)6421;3Ai)3=bLJ?JInxwG
zC;_x5LQMpfJ57X4xmrz$pe2BmCw54hL=jXXK7lA@>1QNqN=Y&{0#C})A~j(4Suktx
v<nRsA?_+et4&ZG9?-=mj`#*kd3jqHEGo~5;a=oIa00000NkvXXu0mjf#3xx!

literal 0
HcmV?d00001

diff --git a/game/script/11.school-assignment-and-route-lock.rpy b/game/script/11.school-assignment-and-route-lock.rpy
index 99b63a7..90ed938 100644
--- a/game/script/11.school-assignment-and-route-lock.rpy
+++ b/game/script/11.school-assignment-and-route-lock.rpy
@@ -3654,6 +3654,7 @@ label chapter_11:
 
     play music 'audio/OST/to_swagger.ogg' fadein 1.0
     "Fang and I have been together for a month now."
+    pause .5
 
     call get_ending
     if _return == 3: #tradwife
@@ -3661,13 +3662,17 @@ label chapter_11:
         "Things are going pretty well. When we discount Trish’s weekly attempt to talk with Fang."
 
         "Rosa and Stella have helped with that."
+        pause .5
 
         "In fact they’ve done a lot for our relationship."
 
         "Between distracting Trish and giving us a space to just be together on the weekends away from everyone."
+
         "Only downside to it is all the fucking gardening we have to do during our alone time."
+        pause .5
 
         "Still, things are good."
+        pause .5
 
     "And right now I’m gonna win our prank war."
 
@@ -3676,50 +3681,80 @@ label chapter_11:
     "How the hell she found a mouse trap that small I’ll never know."
 
     "But I got her a special Pachy treat for her today."
+    pause .5
 
     "For once I can use my weebiness for the greater good."
+    pause .5
 
     scene classroom
     show anon neutral:
-       xalign 0.2
-    show fang neutral flip behind anon:
-       xalign 0.7
-    with fade
+       yalign 0.1 xalign 0.2
+    show fang neutral behind anon:
+       yalign 0.0 xalign 0.8
+    with Dissolve(1)
+    pause .5
 
     A "Hey Sweet Tooth."
 
-    show fang considering flip at sright
+    show fang considering with Dissolve(.25)
     "Fang groans at the pet name. Honestly that hurt me to say too."
 
     "I considered using her mom’s pet name but after the last time, I didn’t want to tempt her."
+    pause .5
 
     "Phase one complete, she’s too distracted to check the box in my hand."
 
     A "Wanna play the pocky game?"
 
-    show fang neutral flip at sright
-
+    show fang:
+        easein_cubic 1 xalign 0.85
+    show fang neutral flip with dissolve
     F "How do you play that?"
+    pause .5
 
     A "Well, I hold one of these,"
 
+    show pocky:
+        ypos .175 xpos .395 zoom .65 rotate 10
+    with dissolve
     "I take one of the green sugary sticks from the box and hold the plain end by my teeth."
 
     A "bhetween mah teef. Den joo haff too take it wiff yer lips."
 
     A "an’ try an’ bite as ‘uch as joo can wiffout touchin’ my fashe."
-
+    
+    show fang unimpressed flip with Dissolve(.25)
     "Fang narrows her eyes in suspicion, and then cautiously moves her head towards mine."
 
+    show anon grin with dissolve
     A "It’sh jush shocola’e!"
+    pause .5
+    
+    show anon behind fang
+    show pocky behind fang
 
+    show fang:
+        easein_back 1.25 xalign 0.45 yalign 0.11
+    pause .75
+    hide pocky
+    show fang neutral flip 
+    with Dissolve(.25)
     "She moves in and crunches down on the pocky stick centimeters from my face."
 
+    show dimmer_lighter behind anon, fang with Dissolve(.25)
     "Jackpot."
-
+    
+    show dimmer_lighter:
+        linear .25 alpha 0
+    show fang:
+        easein_back 0.5 xalign 0.7 yalign 0.0
+    show fang shocked flip with Dissolve(.25)
+    hide dimmer_lighter
     "Her face contorts almost immediately and she spits it out on the floor."
 
-    show fang angry flip at sright
+    show fang:
+        easein_quart 1.5 xalign 0.9
+    show fang surprised flip with Dissolve(.25)
 
     F "...What the fuck is that?! Where did you even get those?"
 
@@ -3727,82 +3762,232 @@ label chapter_11:
 
     A "Let’s just say Stella gets all sorts of weird snacks from Japan."
 
-    A "...Like wasabi pocky sticks."
-
+    A "{cps=*.1}...{/cps}Like wasabi pocky sticks."
+    
+    show fang angry flip with Dissolve(.25)
     "Fang looks ready to strangle me but I still have one card left to play."
 
+    show anon neutral with Dissolve(.25)
     A "Hey, I have amnesty for today, April Fools! Payback for the mousetrap from the other day."
 
+    show fang unimpressed flip with dissolve
+    pause .5
+
+    play sound 'audio/effects/whoosh.ogg'
+    show fang behind anon:
+        easein_back 0.5 xalign 0.6
+    pause .2
+    play sound 'audio/effects/slapstickpunch.ogg' volume .5
+    show anon:
+        easein_cubic 1 xalign 0.1
     "She growls at that and jabs me in the shoulder. I guess I deserve that much."
+    stop music fadeout 3
+    pause .5
 
-    play music 'audio/OST/we just turned on the microphone in our programmers_ house.ogg' fadein 1.0
     "Before I can make my retort, an announcement comes in over the speakers."
+    play music 'audio/OST/we just turned on the microphone in our programmers_ house.ogg' fadein 1.0
+    pause 1
 
-    show fang neutral flip at sright
+    play audio 'audio/effects/spearYellRumbleVoicePA.ogg'
+    pause 1.7
 
-    Sp "ALRIGHT EVERYONE LISTEN UP!"
+    show anon fear:
+        easein_quart 1 xalign 0.05
+    show fang surprised flip:
+        easein_quart 1 xalign 0.7
+    Sp "ALRIGHT EVERYONE LISTEN UP!{fast}" with hpunch
 
+    show anon neutral
+    show fang considering flip
+    with dissolve
+    
     Sp "NEXT MONTH! WILL BE WHAT IS POSSIBLY THE HIGHLIGHT OF YOUR TIME HERE AT VOLCANO HIGH!"
+    pause .5
 
     Sp "PROM! THAT’S RIGHT I SAID IT! TOMORROW WE WILL BE SELLING FUCKING TICKETS TO PROM!"
 
     Sp "SO GET THOSE FORMAL FUCKING OUTFITS READY!"
+    pause .5
 
-    "The P.A. system’s ending chime ushers in a moment of complete silence."
     stop music fadeout 1.0
+    play sound "audio/effects/paEndReverb.ogg" volume 0.25
+    pause .5
+
+    show fang neutral flip with dissolve
+    "The P.A. system’s ending chime ushers in a moment of complete silence."
+    pause .5
 
     "Then, all at once the chatter starts."
+    play ambient 'audio/effects/teenageCrowdLoop.ogg' fadein 0.5
 
     unknown "Ohmanohmanohman, I gotta ask him to go with-"
 
     unknown "-I even have a dress good enough for-"
 
     unknown "-tickets are pretty expensive, I’ll pass this-"
+    pause .5
 
     "Everyone seems excited about the sudden news."
 
-    "Prom, huh…"
-
-    play music 'audio/OST/Summertime Synth.ogg' fadein 1.0
+    "Prom, huh{cps=*.1}...{/cps}"
 
     "I guess I wouldn’t mind going if it’s with Fang."
+    pause .5
 
     "What would she wear?"
 
     "Actually, scratch that, what would I wear?"
 
-    "I can’t afford a decent outfit… Maybe I’ll mail home and ask Dad for his old suit."
+    "I can’t afford a decent outfit{cps=*.1}...{/cps} Maybe I’ll mail home and ask Dad for his old suit."
 
     "Couples tickets are like a hundred bucks, too."
 
     "I’m sure I could make it work if I needed to."
+    pause .5
 
     A "Hey Fa-"
 
+    play music 'audio/ost/dragging on and on....ogg' fadein 0.5
+    stop ambient fadeout 2
+    show farnsworth:
+        yalign 0.1 xalign 1.6
+    show farnsworth:
+        easein_cubic 1 xalign 1.2
+    with dissolve
+
     Drf "Settle down students!"
 
     Drf "There will be plenty of time to scheme your night of debauchery later!"
 
     Drf "We still have the lesson to get through, finish this and then chatter all you need."
-
+    
+    show fang:
+        easein_cubic 1 xalign 0.4
+    show fang unimpressed with dissolve
     "The class collectively throws their heads back to groan."
 
+    show farnsworth concerned with Dissolve(.25)
     Drf "Oh, fiddlesticks. It’s only two pages of particle physics."
 
+    show fang considering with Dissolve(.25)
     F "You have a spare railgun in your backpack?"
 
+    show farnsworth:
+        easeout_cubic 1 xalign 1.6
+    with None
+    show farnsworth with dissolve
+    show fang neutral
+    hide farnsworth 
+    with dissolve
+
     "Professor Fernsworth passes out the assignment and returns to his desk for a quick nap."
+    pause .5
 
     "Particle physics isn’t too hard, more tedious than anything."
 
     "I should finish pretty quickly unless something comes up."
+    pause .5
 
     F "Anon, remind me, what’s a quark again?"
+    pause .5
 
+    stop music fadeout 4
     "Oh right."
 
     "Lab partners."
 
-    "..."
+    "{cps=*.1}...{/cps}"
+    pause .5
+
+    call get_ending
+    if _return != 1: # any route except Shooter
+        # duplicated segment from 11B, 11C and 11D transplanted here
+
+        play music "audio/OST/Appreciating her Company.ogg" fadein 1.0
+        pause .5
+
+        "About fifteen minutes into the assignment, the two of us are just about done."
+
+        "We’re making surprisingly good time."
+
+        show fang considering with Dissolve(.25)
+        F "Uhm{cps=*.1}...{/cps} and you said that the electrons hold the negative charge, right?"
+
+        A "Yeah, yeah."
+        
+        show fang unimpressed with Dissolve(.25)
+        F "Can’t imagine when I’d be using this crap in real life."
+
+        A "You never know, you might shrink one day."
+
+        show fang happy with Dissolve(.25)
+        F "Yeah, and you might stop pretending you’re livestreaming on Yousnoot."
+        pause .5
+
+        A "As far as you know I might be giving you incorrect answers, you know."
+
+        F "Mhm, sure."
+        pause .5
+
+        "The teacher is making his rounds checking on the students and gets to our desks."
+
+        show farnsworth:
+            yalign 0.1 xalign 1.6
+        show farnsworth:
+            easein_cubic 1 xalign 1.2
+        with dissolve
+        pause .5
+
+        Drf "Hello, Anon. Fang."
+
+        Drf "Are you two getting along well?"
+
+        AnonAndFang "Yes, Mister Fernsworth."
+
+        Drf "Great to hear."
+        pause .5
+
+        Drf "You know, I’m real proud of you two."
+        pause .5
+
+        Drf "I remember at the start of the year you were at each other's throats."
+
+        Drf "And now look at you!"
+        pause .5
+
+        show anon concerned
+        show fang sad
+        with dissolve
+        "The two of us cringe."
+        pause .5
+
+        A "Uhh{cps=*.1}...{/cps} Yeah, thanks."
+
+        Drf "At any rate, you two understand the material, right?"
+        
+        show anon happy
+        show fang neutral
+        with dissolve
+        A "Oh yeah, Fang and I are fine."
+
+        show anon neutral with Dissolve(.25)
+        A "I was just helping them with a few problems."
+        pause .5
+
+        "Phew, remembered it this time."
+
+        Drf "Good, good."
+
+        Drf "I won’t keep you any longer then."
+
+        show farnsworth:
+            easeout_cubic 1 xalign 1.6
+        pause .5
+        hide farnsworth with dissolve
+
+        "Fernsworth meanders to pester the next few students."
+        pause .5
+
+        A "Anyways, where were we?"
 
     return
\ No newline at end of file