x7 choreo update

game/script.rpy

@@ -769,7 +769,7 @@ image caller_black = im.Scale("images/other/blackwtransp.png", 656, 700)
 image anon_vc_neutral = im.Flip(im.Crop(im.FactorScale("images/anon/base set/anon neutral.png", 2.0),(900,250,653,800)), horizontal=True)
 image anon_vc_angry = im.Crop(im.FactorScale("images/anon/emotive set/anon angry.png", 2.0),(900,250,653,800))
 image anon_vc_sad = im.Flip(im.Crop(im.FactorScale("images/anon/emotive set/anon sad.png", 2.0),(900,250,653,800)), horizontal=True)
-image anon_vc_neutral_alt1 = im.Crop(im.FactorScale("images/anon/base set/anon neutral.png", 2.0),(800,250,653,800))
+image anon_vc_neutral_alt1 = im.Crop(im.FactorScale("images/anon/base set/anon neutral.png", 2.0),(600,250,653,800))
 image anon_vc_concerned = im.Flip(im.Crop(im.FactorScale("images/anon/base set/anon concerned.png", 2.0),(900,250,653,800)), horizontal=True)
 image anon_vc_happy = im.Flip(im.Crop(im.FactorScale("images/anon/emotive set/anon happy.png", 2.0),(900,250,653,800)), horizontal=True)
 image anon_vc_grin = im.Flip(im.Crop(im.FactorScale("images/anon/base set/anon grin.png", 2.0),(900,250,653,800)), horizontal=True)

game/script/x7-naomi-tribulations.rpy

@@ -5,16 +5,13 @@ label chapter_x7:
     scene home fang day with fade
     play music "audio/OST/west_coast_kicking.ogg" fadein 1.0
 
-
-
-
     show fang nonxmas pendant unimpressed at scenter with dissolve
+
+    show fangphonevideocall anonneutral zorder 1 with easeinbottom:
+        yalign -0.4
         # yalign 0.4
         # xalign 0.1
 
-    show fangphonevideocall anonneutral at scenter with easeinbottom:
-        yalign -0.4
-    hide fang with dissolve
 
     F "-I’m just saying is that he shouldn’t have tried-"
 
@@ -47,8 +44,6 @@ label chapter_x7:
     F "{cps=*2.0}Trying to!{/cps}"
 
     show fang nonxmas pendant sad with dissolve
-    pause 0.5
-    hide fang with dissolve
 
     show fangphonevideocall anonneutral at scenter with easeinbottom:
         yalign -0.4
@@ -108,19 +103,24 @@ label chapter_x7:
     "I exhale deeply and feel all the weight of my current predicament land on my shoulders."
 
     F "I don’t know. Maybe Stella-{w=0.3} what?"
-    show fangphonevideocall anonneutralalt1 with dissolve
+    show fangphonevideocall anonneutralalt1 with dissolve:
-    show fangphonevideocall anonneutral with dissolve
+        pause .2
-    show fangphonevideocall anonneutralalt1 with dissolve
+        "fangphonevideocall anonneutral"
-    show fangphonevideocall anonneutral with dissolve
+        pause .2
-    show fangphonevideocall anonneutralalt1 with dissolve
+        "fangphonevideocall anonneutralalt1"
-    show fangphonevideocall anonneutral with dissolve
+        repeat
+
     "Anon’s head is shaking rapidly and his hands are waving like crazy."
 
+    show fangphonevideocall anonneutral with dissolve:
+        yalign -0.4
+
     F "I don’t see what the problem would be with Stella as a roommate."
 
     hide fangphonevideocall with easeoutbottom
 
-    show fang nonxmas pendant unimpressed at sleft with dissolve
+    show fang nonxmas pendant unimpressed at sleft with dissolve:
+        easeout_cubic 1.0 xalign 0.0
     show fangdad neutral flip at sright with easeinright
     FD "Oi!{w=0.3} Stop slackin’ Lucy. The living room ain’t gonna clean itself!"
 
@@ -150,7 +150,7 @@ label chapter_x7:
     A "We’ll talk later, Fang. Have fun with the party okay?"
 
     show fangphonevideocall call_ended_bg call_ended with dissolve:
-        yalign -0.045
+        easein_cubic 1.0 yalign -0.04
     # yalign 0
     "Before I can say I love him the screen fades to my wallpaper."
 
@@ -163,11 +163,15 @@ label chapter_x7:
     "Anon…"
 
     "..."
-    hide fangphonevideocall with dissolve
+    show fangphonevideocall call_ended_bg call_ended:
+        easein_cubic 1.0 yalign -2.04
     stop music fadeout 2.0
 
+    #BLK
+    scene black
     scene livingroomdayalt
     with fade
+    hide fangphonevideocall with dissolve
     play music "audio/OST/to_swagger.ogg" fadein 1.0
     play ambient "audio/effects/teenageCrowdLoop.ogg" fadein 2.0
     show fang nonxmas pendant neutral at scenter with dissolve:
@@ -201,9 +205,10 @@ label chapter_x7:
 
     "Naser’s close school friends are all ready and perched out of sight of the entryway."
 
-    show chadshark at scenter
+    show chadshark at scenter with easeinleft:
-    show stella happy at sleft
+        easein_cubic .39 xalign -0.4
-    with easeinleft
+    show stella happy at sleft with easeinleft:
+        easein_cubic .49 xalign -0.2
 
     show dimmer_darker with dissolve
     "I notice one of his old team mates even brought Stella along when I turn the light knob."
@@ -291,9 +296,9 @@ label chapter_x7:
     F "Shit, hide!"
     stop music fadeout 1.0
     stop ambient fadeout 2.0
-    hide fang
+    show fang psurprised flip behind dimmer_darker with dissolve:
-    hide trish
+    hide fang with easeoutright
-    with dissolve
+    hide trish with easeoutright
     "Everyone in the room scatters, hiding as best they can in our living room."
 
     "I even see Stella and the old varsity Football captain dive into the closet."
@@ -340,13 +345,29 @@ label chapter_x7:
     #potentially use fang very happy with a modified pendant cause it looks much better
     show fang nonxmas pendant very happy with dissolve:
         xzoom -1.0
+    show fang nonxmas pendant very happy:
+        ease_cubic 0.18 yalign 0.18
+        linear 0.049 yalign 0.22
+        linear 0.049 yalign 0.20
+        ease_cubic 0.18 yalign 0.0
     F "Naomi’s pregnant!"
 
-    show naser shocked
+
-    show naomi shocked
+    show naser shocked:
+        ease_cubic 0.1 xalign -0.8
+        ease_cubic 0.1 xalign -0.6
+        repeat 2
+    show naomi shocked:
+        ease_cubic 0.1 xalign 0.01
+        ease_cubic 0.1 xalign 0.02
+        repeat 2
     with dissolve
     NaserAndNaomi "WHAT!?"
 
+    show fangmom neutral flip:
+        ease_cubic 0.1 yalign 0.2
+        ease_cubic 0.1 yalign 0.0
+
     FM "GRANDBABIES?!?!"
 
     show fangdad unimpressed flip:
@@ -354,7 +375,10 @@ label chapter_x7:
     pause 0.1
     show fangdad unimpressed flip:
         ease_cubic 0.2 yalign 0.0
-    show fang nonxmas pendant surprised with dissolve
+    show fang nonxmas pendant surprised:
+        yalign 0.0
+        ease_cubic 0.1 xalign 0.4
+        ease_cubic 0.1 xalign 0.5
     "Dad swats my crest with one hand."
 
     show stella neutral flip
@@ -371,17 +395,20 @@ label chapter_x7:
 
     "I see the little gerbil on a treadmill in his head spinning aimlessly until comprehension dawns on him that his privacy has been violated."
     show naomi neutral with dissolve
-    show naser surprised flip at sleft with dissolve:
+
-        xzoom -1.0
+    show naser:
-        xalign -0.28
+        ease_cubic 0.5 xalign -0.28
+    show naser surprised with dissolve
+
     Nas "Oh.{w=0.3} My yearbook."
 
     FM "Don’t worry dear, I put it back in your dirty laundry pile where it was left!"
 
     "Aside from the peanut gallery this is fairly standard dinner banter."
 
-    show naser annoyed flip at sleft with dissolve:
+    show naser:
-        xalign -0.6
+        ease_cubic 0.5 xalign -0.6
+    show naser annoyed flip with dissolve
 
     Nas "{cps=*0.5}Moooooooooomm{/cps}, not in front of my friends."
 
@@ -389,8 +416,16 @@ label chapter_x7:
     show naser happy flip with dissolve
     "The other track members nod in agreement."
     show naser happy flip behind naomi
-    show naomi happy
+    show naomi:
-    with dissolve
+       ease_cubic 0.5 xalign 0.3
+    show naomi happy with dissolve
+
+    show naomi:
+       yalign 0.0
+       ease_cubic 0.2 yalign 0.1
+       ease_cubic 0.2 yalign -0.1
+       pause 0.1
+       repeat
     N "It’s great everyone came! Let’s all enjoy the party!"
 
     "A holler of agreement and the whole thing kicks off as though it had been going on for hours already."
@@ -400,6 +435,13 @@ label chapter_x7:
     hide fangmom
     hide fangdad
     hide moe
+    with easeoutright
+
+    show naomi happy
+    show naser happy
+    hide naser
+    hide naomi
+    with easeoutleft
     scene livingroomdayalt
     show fang nonxmas pendant neutral at scenter:
         xzoom -1.0
@@ -556,26 +598,33 @@ label chapter_x7:
 
     show trish neutral with dissolve
     pause 0.1
-    show trish angry with dissolve
+    show trish angry with dissolve:
-    show trish angry:
+        linear 0.05 xalign -0.005
-        yalign 0.0
-        linear 0.05 xalign 0.005
         linear 0.05 xalign 0
         repeat
     pause 0.1
-    show trish with move:
+    show trish:
-        ease_cubic 0.2 xalign 0.2
+        ease_cubic 0.03 xalign 0.17
-    show fang nonxmas pendant neutral:
+        pause 0.1
-        ease_cubic 0.2 xalign 0.55
+        ease_cubic 0.7 tleft
+    pause 0.03 + 0.1 + 0.7
+    show trish:
+        linear 0.05 xalign -0.005
+        linear 0.05 xalign 0.0
+        linear 0.05 xalign -0.005
+        repeat
 
-    show trish annoyed at tleft with dissolve
+
+
+    show fang nonxmas pendant neutral:
 
     "Trish tries to headbutt me, but I already have her at arm’s length with my palm on her face."
 
     F "For your info, I bet in your favor."
 
-    show trish neutral at tleft with ease:
+    show trish with ease:
         xalign -0.1
+    show trish neutral with dissolve
     "Trish finally relents, leaning back against the wall."
 
     show trish explanatory with dissolve
@@ -676,7 +725,7 @@ label chapter_x7:
     F "Aha! I got it."
 
     show fang nonxmas pendant happy:
-        ease_cubic 0.5 xalign 0.8
+        ease_cubic 0.8 xalign 1.4
     "I set down my three favorites at the foot of my bed and sprinkle some cracker crumbs in front of them."
 
     "Then with a quick tap of my foot I let my most loyal minion decide."
@@ -692,17 +741,28 @@ label chapter_x7:
         xzoom -1.0
 
     show fang nonxmas pendant happy:
-        ease_cubic 0.5 xalign -0.4
+        ease_cubic 0.5 xalign -0.0
     pause 0.1
+    show naomi neutral flip with dissolve:
+        xalign -0.2
     show fang nonxmas pendant shocked with dissolve:
-        xalign -0.3
+        xalign 0.0
+        linear 0.2 xalign 0.4
+        linear 0.2 xalign 0.3
+        linear 0.2 xalign 0.4
 
     "Only to nearly get kneecapped by Naomi’s stupidly fat tail."
 
+    show naomi sad with dissolve:
+        xalign -0.2
+
     "Who would even like a girl with such a disgusting, lardy tail."
     show fang nonxmas pendant angry with dissolve
     "Unlike mine."
 
+    show fang:
+        easein_cubic 0.2 yalign 0.03
+        easeout_cubic 0.1 yalign -0.0
     F "What the fuck!"
 
     "She scowls."
@@ -711,6 +771,8 @@ label chapter_x7:
 
     N "I didn’t mean to. I was simply heading for the bathroom up here. It seems that Chet and-or Stella are currently using the other bathroom."
 
+    show naomi sad flip with dissolve
+    hide naomi sad flip with easeoutleft
     "She turns her nose and continues down the hallway."
 
     "I’m half-tempted to brain her with my beloved guitar."
@@ -720,7 +782,7 @@ label chapter_x7:
     "I turn and make my way down the steps."
 
     scene livingroomdayalt
-    show fang nonxmas pendant neutral at sleft:
+    show fang nonxmas pendant happy at sleft:
         yalign 0.4
         xalign -0.8
     show trish neutral flip at tleft
@@ -734,14 +796,17 @@ label chapter_x7:
         xalign 1.3
     with fade
 
-    pause 0.3
-
     show trish:
-        ease_cubic 0.3 xalign 0.4
+        ease_cubic 0.9 xalign 0.4
 
-    show fang nonxmas pendant happy at sleft with dissolve:
+    show fang:
-        xalign -0.55
+        pause .4
-        yalign 0.2
+        parallel:
+            easein_cubic 0.7 xalign -0.55
+        parallel:
+            block:
+                easein_cubic 0.2 yalign 0.45
+                easeout_cubic 0.3 yalign 0.2
 
     "Trish scooches to give me enough space on the stairs to set the guitar on my knee to play."
 
@@ -760,17 +825,44 @@ label chapter_x7:
     stop music fadeout 2.0
     pause 1.0
     play music "audio/OST/The.ogg" fadein 2.0
+
+    show stella neutral flip:
+        easeout_cubic 0.23 yalign 0.0
+        easein_cubic 0.23 yalign 0.03
+        repeat
+    show chadshark flip:
+        easein_cubic 0.23 yalign 0.02
+        easeout_cubic 0.23 yalign 0.0
+        repeat
+
+
     "I run the first few stanzas in my head a couple of times and begin strumming."
 
     "My fingers glide along the fretboard easily enough and my pick wildly plucks the cords."
 
     "The party is cheering and stamping out a drum beat for me to play to."
 
+    show trish smile flip:
+        easein_cubic 0.23 yalign 0.05
+        easeout_cubic 0.23 yalign 0.1
+        repeat
+
     "Even Trish beside me is joining in on the makeshift metronome."
 
+
     "I let loose a hard and fast rift, taking the chance to actually feel out the crowd."
-    show trish happy flip
+    show trish happy flip:
-    show stella happy flip
+        easein_cubic 0.23 yalign 0.08
+        easeout_cubic 0.23 yalign 0.1
+        repeat
+    show stella happy flip:
+        easeout_cubic 0.23 yalign 0.1
+        easein_cubic 0.23 yalign 0.06
+        repeat
+    show chadshark flip:
+        easein_cubic 0.23 yalign 0.04
+        easeout_cubic 0.23 yalign 0.01
+        repeat
     with dissolve
     "All of the jocks and even Stella are loving this."
     show fangdad neutral flip with dissolve
@@ -784,6 +876,12 @@ label chapter_x7:
     "I nearly miss my next note, so I focus back on my guitar."
 
     "With an extra flourish I end the punk song with a fist pump."
+
+    show fang:
+        easein_cubic 0.1 yalign 0.1
+        linear 0.2 yalign 0.35
+        pause .03
+        easeout_cubic 0.34 yalign 0.2
     stop music fadeout 2.0
     play ambient "audio/effects/teenageCrowdLoop.ogg" fadein 2.0
     "The room hollers, demanding more amazing music from me."
@@ -799,13 +897,19 @@ label chapter_x7:
     show fang nonxmas pendant happy with dissolve
     "With the spotlight on Naser now I decide to just sit back on the stairs."
 
-    show trish neutral flip with dissolve
+    show trish neutral flip at tleft with dissolve:
+        xalign 0.4
     T "Still gonna play?"
 
     F "Eh… Thinking something slower now."
 
     F "Dad’ll pitch a fit if they start a mosh pit."
 
+    hide stella happy flip
+    show stella neutral flip behind trish at scenter with dissolve:
+        xalign 0.6
+    show chadshark flip at scenter behind stella,fangmom,fangdad,trish with dissolve:
+        xalign 1.0
     play music "audio/OST/middle_of_nowhere.ogg" fadein 2.0
     "We chuckle together, my fingers now lazily strumming a mellow tune for the party."
 
@@ -818,21 +922,27 @@ label chapter_x7:
     hide chadshark
     hide naomi
     hide stella
+    hide fang
+    hide trish
     with dissolve
 
+    pause .5
+
     show fang nonxmas pendant happy:
+        xalign -0.8
         yalign 0.0
     show trish neutral behind fang:
-        xalign 0.2
+        xalign 0.0
     show stella neutral at scenter:
-        xalign 0.6
+        xalign 0.4
     show chadshark behind stella,naser at tcenter:
-        xalign 0.8
+        xalign 0.6
     show naomi neutral flip at nright:
         xalign 1.3
     show naser tablehit behind naomi,stella:
         xpos 0.6
     with dissolve
+
     "Naser and Chet have started arm wrestling."
 
     "Stella and some of Naser’s old teammates are talking like crazy about something."
@@ -848,9 +958,41 @@ label chapter_x7:
 
     Chet "It really is, bros! We’ve been marathonin’ it er’ry weekend!"
 
+    image sodaproj = im.FactorScale("images/other/sodacan.png", 0.2)
+
+    show sodaproj:
+        rotate 90
+        xalign 1.3
+        yalign 0.1
+        easeout_cubic 0.35 xalign 0.62
+        pause .03
+        block:
+            parallel:
+                easein_cubic 0.88 xalign 1.3
+            parallel:
+                easein_cubic 0.24 yalign 0.0
+                ease_cubic 1.57 yalign 2.0
+            parallel:
+                linear 0.7 rotate 360
+                block:
+                    linear 0.3 rotate 360
+                    repeat
+    show chadshark:
+        pause .35
+        easeout_cubic 0.12 xalign 0.5
+        easein_cubic 0.3 xalign 0.6
+    pause .35
+    play sound 'audio/effects/anonDink.ogg'
+
     "The jocks start jeering and tossing their solo cups at him."
 
+    show chadshark:
+        linear 0.1 yalign -0.1
+    show naser:
+        easein_cubic 0.21 yalign 0.1
     "Giving Naser the chance to finally win."
+    show chadshark with dissolve:
+        yalign 0.0
     show naser happy flip at nright behind naomi with dissolve:
         xalign 1.4
 
@@ -881,6 +1023,9 @@ label chapter_x7:
     hide stella
     hide naomi
     hide naser
+
+    pause .5
+
     show trish indignant flip:
         xalign 0.4
     with dissolve