stash ch3 auditorium changes, add new trish sprite to previous scenes

game/script.rpy

@@ -302,6 +302,7 @@ image trish indignant flip = im.Flip("trish/trish indignant.png", horizontal=Tru
 
 #surprised flip
 image fang surprised flip = im.Flip("fang/basic set/fang surprised.png", horizontal=True)
+image trish surprised flip = im.Flip("trish/trish surprised.png", horizontal=True)
 
 
 #other flips

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

@@ -3122,7 +3122,7 @@ label chapter_1:
 
     "{cps=*0.1}...{/cps}"
 
-    stop music fadeout 1
+    stop music fadeout 2.5
     pause 2
 
     return

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

@@ -1634,7 +1634,7 @@ label chapter_2:
     show reed considering flip
     Re "Literally,{w=.3} even."
 
-    show trish neutral flip
+    show trish surprised flip
     show reed neutral flip
     with dissolve
     Re "So I figured,{w=.4} why not be a bro back to him?"
@@ -2001,7 +2001,7 @@ label chapter_2:
        easein 0.5 xalign 0.54
     show fang surprised flip:
        easein 0.5 xalign 0.99
-    show trish neutral flip:
+    show trish surprised flip:
        easein 0.5 xalign 1.155
     # TODO: all three look at anon with surprise
     pause .5
@@ -2016,7 +2016,9 @@ label chapter_2:
     stop ambient fadeout 1
     play music 'audio/OST/Bayside Bumming it.ogg'
 
-    show reed explanatory flip with Dissolve(.25)
+    show trish neutral flip
+    show reed explanatory flip 
+    with Dissolve(.25)
     Re "Jeez man,{w=.4} you got the ears of a bat?"
     show reed neutral flip
     pause .5

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

@@ -327,8 +327,9 @@ label chapter_3:
     show trish neutral with Dissolve(.11)
     show trish unimpressed with Dissolve(.11)
     show trish angry with Dissolve(.11)
-    show trish considering with Dissolve(.11)
+    show trish surprised with Dissolve(.11)
-    pause .1
+    pause .2
+    # show trish considering with Dissolve(.11)
     show trish: #0.45
         linear 0.05 xalign 0.455
         linear 0.05 xalign 0.45
@@ -738,6 +739,9 @@ label chapter_3:
         easein 0.5 yalign 0.1 alpha 1
 
     "I get up from the floor and look at the stego who bumped into me.{w=.5} The plates on her back twitch as she looks me up and down."
+    show anon:
+        alpha 1 yalign 0.1
+
 
     unknown "{cps=*.3}Judgement{/cps}{cps=*.1}...{/cps}"
 
@@ -1079,6 +1083,7 @@ label chapter_3:
     pause .15
     play sound 'audio/effects/slapstickPunch.ogg'
     show anon angry flip
+    show fang surprised
     A "FUCK YOU!" with vpunch
 
     show jingo at sleft with dissolve
@@ -1098,107 +1103,245 @@ label chapter_3:
     # CH3 SCENE 5 -
 
     play music 'audio/OST/Appreciating the Atmosphere.ogg' fadein 2
-    scene hallway with Fade(1, 0, 1)
+    scene hallway
+    show anon neutral:
+        yalign 0.1 xalign 0.05
+    show fang considering:
+        yalign 0.0 xalign 0.99
+    with Fade(1, 0, 1)
     pause .5
 
-    F "Hurry up, dweeb. If I can keep ahead of you while carrying two instruments, you can speedwalk."
+    F "Hurry up,{w=.3} dweeb.{w=.5} If I can keep ahead of you while carrying two instruments,{w=.4} you can speedwalk."
+    pause .5
 
     A "You sure you don’t want me to carry one?"
 
+    show fang unimpressed with Dissolve(.25)
     F "Pfeh."
 
-    "Fang is leading me back to the auditorium with both the acoustic guitar ‘borrowed’ from the music room and her bass in hand, one over each shoulder."
+    "Fang is leading me back to the auditorium with both the acoustic guitar ‘borrowed’ from the music room and her bass in hand,{w=.5} one over each shoulder."
 
-    # TODO: SCENE auditorium doors
 
-    "When we eventually get to the auditorium, Fang stops."
+    scene door auditorium 
+    show anon neutral:
+        yalign 0.1 xalign 0.05
+    show fang neutral:
+        yalign 0.0 xalign 0.99
+    with Dissolve(1)
+
+    "When we eventually get to the auditorium,{w=.4} Fang stops."
+
+    show fang neutral flip with dissolve
+    pause .5
 
     "Is something wrong?"
+    pause .5
 
-    A "Uh, is everything-"
+    A "Uh,{w=.4} {cps=*.4}is everything-{/cps}{w=.3}{nw}"
 
-    F "The doors, moron."
+    show fang unimpressed flip with Dissolve(.25)
+    F "The doors,{w=.3} moron."
 
     "She swings the guitar cases on her shoulders around a bit."
+    pause .5
 
     "Oh."
 
-    "I step around her and grab the handle, pulling the door wide open."
+    "I step around her and grab the handle,{w=.4} pulling the door wide open."
+    pause .5
 
     A "Ladies first."
+    pause .5
+
+    show fang angry flip with Dissolve(.25)
+    "{cps=*.1}...{/cps}"
+    pause .5
 
     "Fang growls and stomps on my foot as she walks past."
 
-    "..."
+    show fang neutral flip with Dissolve(.25)
+    show fang neutral flip behind anon:
+        easeout 1 xalign 0.25
+    pause .4
+    hide fang with dissolve
+    pause .25
 
-    A "FUCK!"
+    play sound 'audio/effects/slapstickBigPunch.ogg'
+    show anon shocked:
+        easein_elastic 0.5 yalign -0.05 xalign -0.3
+    A "FUCK!" with vpunch
 
     F "Hurry up already."
 
     scene auditorium
-    show reed neutral flip at rright
+    show reed neutral flip:
-    show trish neutral at tcenter
+        yalign 0.1 xalign 1.6
-    "Inside, Reed and Trish already have everything set up onstage."
+    show trish neutral:
-    show fang neutral with moveinleft:
+        yalign 0.0 xalign 0.85
-        xalign 0.2 yalign 0.1
+    show dimmer_light behind trish, reed
-    show anon neutral with moveinleft:
+    with Fade(1, 0, 1)
-        xalign -0.1 yalign 0.0
+    pause .5 
+
+    "Inside,{w=.4} Reed and Trish already have everything set up onstage."
+
+    show fang neutral behind dimmer_light:
+        yalign -0.55 xalign -1.5
+    show anon neutral behind dimmer_light:
+        yalign -0.45 xalign -1
+    show fang:
+        easein 1 yalign -0.55 xalign -0.1
+    show anon:
+        easein 1 yalign -0.45 xalign -0.275
+    with dissolve
+    pause 1
+
     "Where does Reed keep that huge drumset during the day?"
+
     show trish very happy flip with dissolve
+
     "Trish waves her arms from the stage."
-    T "HEY, FANG! WHAT TOOK SO LONG?"
+
+    T "HEY,{w=.3} FANG!{w=.5} WHAT TOOK SO LONG?"
+    pause .5
+
     F "HAD TO GRAB SOMETHING."
-    show trish unimpressed
+
-    "Trish squints in the spotlight, then finally notices me."
+    show trish neutral flip with dissolve
-    show trish indignant
+    "Trish squints in the spotlight,{w=.4} then finally notices me."
 
     # TODO: Punk revamp?
 
+    show trish unimpressed flip with dissolve
     T "What-"
+
+    show trish behind reed:
+        easein_cubic 1 xalign 0.95
+    show trish indignant flip with Dissolve(.25)
     T "What’s he doing here?!"
-    "Fang slings both cases onto the stage, then climbs on herself."
+
+    "Fang slings both cases onto the stage,{w=.4} then climbs on herself."
+
+    show fang:
+        easein_cubic 0.75 xalign 0.4
+    show trish unimpressed flip with Dissolve(.25)
+    pause 0.5
+    show anon behind fang
+    show fang:
+        easein_back 1 yalign 0.0 xalign 0.5
+    show dimmer_light behind fang with dissolve
+
     F "Proving a dumbass bigot wrong."
+    pause .5
+
     A "So you admit there’s smart ones?"
-    show fang angry
+
-    show jewlcase at truecenter:
+    show fang unimpressed with Dissolve(.25)
-       xalign 0.5 yalign 0.5 zoom 0.3
+
-       rotate 0.6
-       linear 0.3 xalign 0.05 yalign 0.12
-       linear 1.5 yalign 5.0
     "Fang then ripped something from Trish’s hands and threw it at me."
-    show trish angry
+
-    T "What the fuck?!"
+    show fang:
-    "It strikes against my head with a dull *tonk* and lands on the ground in front of me."
+        easein_cubic 1 xalign 0.8
+    pause 1.25
+    play sound 'audio/effects/whoosh.ogg'
+    show trish surprised flip
+    show fang unimpressed flip:
+        easein_quart 0.5 xalign 0.5
+
     show jewlcase at truecenter:
-       xalign 0.5 yalign 0.5 zoom 1.0
+        xanchor 0.5 yanchor 0.5
+        xpos 0.5 ypos 0.5 zoom 0.3
+        linear 0.5 align (.15, .4) knot (0.25, 0.25) rotate 395
+    show jewlcase behind dimmer_light with dissolve
+    play sound 'audio/effects/slapstickPunch.ogg'
+    show anon:
+        easein_quart 0.25 xalign -0.3 #-0.275
+        easein 0.25 xalign -0.275
+    show jewlcase:
+        easein_quart 0.25 xpos 0.14
+        easein 0.25 xpos 0.15
+    pause 0.5
+    show jewlcase:
+        easeout_cubic 0.5 ypos 1.1 rotate 445
+    pause 1.5
+
+
+    show trish angry flip with Dissolve(.25)
+    T "What the fuck?!"
+
+    "It strikes against my head with a dull *tonk* and lands on the ground in front of me."
+    pause .5
+
+    show jewlcase:
+        xalign 0.5
+    show dimmer_light behind jewlcase
+    show fang behind jewlcase
+    show trish behind jewlcase
+    show jewlcase with easeinbottom:
+        rotate 20 xalign 0.5 zoom 1.5
+        yalign 1.5
+
     "Looking down at the makeshift shuriken, it was a copy of 'VVORM DRAMA’s new hit single Indragon Onslaught'"
-    hide jewlcase
+
-    show trish indignant
+    hide jewlcase with easeoutbottom
-    T "Fang! I just made that in art class!"
+    pause .5
+
+    show trish:
+        easein_cubic 0.5 xalign 0.9
+    show trish indignant flip with Dissolve(.25)
+    T "Fang!{w=.4} I just made that in art class!"
+
     A "It looks like picasso had a seizure."
-    show fang considering
+
+    show fang considering flip 
+    show trish neutral flip
+    with Dissolve(.25)
+
     F "He was being an ass!"
+
     A "I was."
+    pause .5
+
     show reed explanatory flip
-    Re "Like… are we on break now?"
+    Re "Like{cps=*.1}...{/cps} are we on break now?"
-    T "We haven’t even started!"
     show reed neutral flip
-    T "Fang! Why is Anon here?!"
+
+    show trish considering flip with Dissolve(.25)
+    T "We haven’t even started!"
+    pause .5
+
+    show trish annoyed flip with dissolve
+    T "Fang,{w=.4} why is Anon here?"
+
     show fang neutral
+
     F "Like I said, proving him wrong."
+
     A "More like proving me right."
+
     T "Proving him wrong how?"
+
     Re "Like… Playing guitar, right? Ya wanted to play your guitar…"
+
     T "What?"
+
     F "Yes! I mean-"
+
     A "Ha!"
+
     F "No, I mean Anon thinks that if I used a guitar instead of bass the music would sound better."
+
     show trish neutral
+
     T "What? No wayyyy."
+
     F "I know, right?"
+
     Re "Woooow… Way to try throwing everything off, Anon..."
+
     F "Mm. Let’s just go through ‘I Need Meth Money By Tuesday Night And If I Don’t Get It I Will Stomp On Your Child’."
+
     "Don’t say ayy lmao."
+
     F "Three… Two... One.."
 
     #half life flash bang