Merge pull request 'Naomi Bonus Chapters Choreography' (#147) from nutbuster/SnootGame:p7_naomi_choreo into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/147

game/script/x8-naomi-tribulations.rpy

@@ -124,8 +124,8 @@ label chapter_x8:
     N "Naser, please, you’ve seemed troubled the entire day. What’s wrong?"
 
     show naomi neutral
-    hide naser
     show naser explanatory flip at nright with dissolve:
+        "naser explanatory flip"
         xalign 1.6
     Nas "Nothing! Nothing at all Naomi!"
 
@@ -168,7 +168,8 @@ label chapter_x8:
     Nas "I mean, I wanted to tell you sooner but-"
 
     N "I understand, Naser. After all, you always have the best ideas."
-    show naomi sad at turnaround
+    show naomi sad flip with dissolve
+    pause .2
 
     hide naomi with easeoutleft
 
@@ -196,6 +197,10 @@ label chapter_x8:
 
     "Been the model girlfriend, right?"
 
+    show naomi:
+        ease_cubic 0.6 xalign 0.4
+        pause .4
+        ease_cubic 0.6 xalign 0.3
     "I carry myself down the driveway, trying to hold my thoughts together."
 
     "Spring is about over, but it’s cold."
@@ -204,6 +209,12 @@ label chapter_x8:
 
     "Everything was going wonderfully, but now it’s come shattering down."
 
+    show naomi sad flip:
+        parallel:
+            ease_cubic 0.8 xalign 0.1
+        parallel:
+            ease_cubic 0.8 yalign -0.4
+            ease_cubic 1.2 yalign -0.5
     "When I reach the curb I crumple into my knees."
 
     "I can’t even focus on a single calamitous thought with so many firing through me."

game/script/x9-naomi-tribulations.rpy

@@ -1,5 +1,9 @@
 
 label chapter_x9:
+
+    window hide
+    window auto
+
     #Naomi Arc Three
     play music 'audio/OST/you can_t sage here.ogg' fadein 2.0
     scene livingroomdayalt
@@ -29,8 +33,11 @@ label chapter_x9:
     show fang nonxmas pendant considering with dissolve
     show naser sad flip with dissolve
     "Think Lucy, Think! How do you unfuck this fuck-up?"
-    show fang nonxmas pendant angry with dissolve:
+
+    show fang:
         xzoom -1.0
+        ease_cubic 1.2 xalign -0.8
+    show fang nonxmas pendant angry
     "I look out the window and watch as Naomi continues wailing."
 
     "Even though I despise the idea, Naomi needs someone to be there for her and support her now more than ever."
@@ -38,8 +45,10 @@ label chapter_x9:
     "With the thought of what I’m about to do, I realize just how much Anon had really done for me."
 
     "But god damn it, I really don’t want to{cps=*.20}...{/cps}"
-    show fang nonxmas pendant unimpressed with dissolve:
+    show fang:
         xzoom 1.0
+        ease_cubic 1.1 xalign -0.4
+    show fang nonxmas pendant unimpressed with dissolve
     stop music fadeout 5.0
     "I turn back to face my brother, who looks like he wants to jump from our house’s roof."
 
@@ -50,7 +59,14 @@ label chapter_x9:
     "Naser nods and takes up the broom Naomi set aside, distracting himself by sweeping up the rest of the trash on the floor."
 
     show naser sad flip:
-        ease_cubic 1.0 xalign 0.5
+        ease_cubic 2.0 xalign 0.5
+        pause .8
+        block:
+            pause .4
+            ease_cubic 1.2 xalign 0.5
+            pause .2
+            ease_cubic 1.2 xalign 0.6
+            repeat
 
     "Easy part done."
 
@@ -58,8 +74,6 @@ label chapter_x9:
         xzoom -1.0
     pause 1.0
     hide fang with easeoutleft
-    show naser sad flip:
-        ease_cubic 1.0 xalign 0.6
 
     "I take a calming sigh and walk out the door to the wailing idiot trying to wake up the whole neighborhood."
 
@@ -112,11 +126,15 @@ label chapter_x9:
 
     "Somehow, her sobbing gets louder, to the point that I feel my ears start to ring. Any louder, and she’s going to give me tinnitus."
 
+    show fang:
+        ease_cubic 0.23 xalign 0.45
     show fang nonxmas pendant angry with dissolve
-    F "NAOMI! Get a FUCKING grip!"
+    with vpunch
+    F "NAOMI!{w=0.2} Get a FUCKING grip!"
 
     show naomi sad at sleft with dissolve:
         yalign -0.5
+
     "Naomi finally looks up to me with a tear-stained face."
 
     N "A break{cps=*.20}...{/cps}{w=1.0} N-Naser s-said he{cps=*.20}...{/cps} {w=1.0}he wants to take a break!"
@@ -129,10 +147,26 @@ label chapter_x9:
     F "{cps=*.20}...{/cps}And?"
 
 
-    show naomi angry with dissolve:
+    show naomi angry with dissolve
-        ypos 0.5 xalign -0.4
+    show naomi:
-        ease_cubic 0.2 rotate -15
+        parallel:
-        ease_cubic 1.0 rotate 0 yalign 0.2
+            ease_cubic 0.3 yalign 0.15
+            ease_cubic 0.3 yalign 0.08
+        parallel:
+            ease_cubic 0.6 xalign 0.37
+
+        block:
+            parallel:
+                ease_cubic 0.12 yalign 0.065
+                ease_cubic 0.12 yalign 0.055
+            parallel:
+                ease_cubic 0.14 xalign 0.39
+                ease_cubic 0.14 xalign 0.4
+            repeat
+
+    show fang:
+        pause .23
+        ease_cubic 0.33 xalign 0.85
 
 
     "Naomi, who had still been lying on her knees up to this point, scowls at me with a face full of fire and fury before rising to her feet."
@@ -142,10 +176,28 @@ label chapter_x9:
 
     N "Naser and I are the perfect couple!"
 
+    show naomi:
+        ease_cubic 0.132 xalign 0.39
+        ease_cubic 0.132 xalign 0.4
+        repeat
+
     N "He is the perfect boyfriend!"
 
     N "And I am the perfect girlfriend!"
 
+    show naomi:
+        yalign 0.055
+        ease_cubic 0.13 xalign 0.392
+        ease_cubic 0.13 xalign 0.4
+        ease_cubic 0.18 xalign 0.395
+        ease_cubic 0.18 xalign 0.4
+        ease_cubic 0.28 xalign 0.397
+        ease_cubic 0.28 xalign 0.4
+        block:
+            ease_cubic 0.23 xalign 0.397
+            ease_cubic 0.23 xalign 0.4
+            repeat
+
     N "We’re supposed to have the perfect life together!"
 
     N "Wh-why does he want us to take a break in our relationship!?"
@@ -163,6 +215,10 @@ label chapter_x9:
     "Still{cps=*.20}...{/cps} {w=0.2}not like Naser’s going to be any better at this."
 
     "Fuck{cps=*.20}...{/cps} {w=0.2}guess it really comes down to me{cps=*.20}...{/cps}"
+
+    window hide
+    window auto
+
     show naomifangcg with dissolve
     play ambient1 ['<sync ambient>audio/OST/good faith leadup drums synth.ogg', 'audio/OST/good faith leadup drums synth.ogg'] fadein 5.0
     "I sit down next to Naomi on the curb."
@@ -342,6 +398,10 @@ label chapter_x9:
     "I can’t fucking stand Naomi’s bullshit anymore."
 
     "I stand up and for once look down on the salmon-toned asshole."
+
+    window hide
+    window auto
+
     hide fang
     scene home fang outside night
     with dissolve
@@ -381,10 +441,17 @@ label chapter_x9:
     F "You only wanted him for the prestige it would bring you!"
 
     show naomi:
-        ease_cubic 0.2 xalign 0.6
+        ease_cubic 0.23 xalign 0.56
-        ease_cubic 0.2 xalign 0.7
+    pause 0.22
+    play sound 'audio/effects/slapstickPunch.ogg'
+    show naomi:
+        ease_cubic 0.5 xalign 0.7
+    show fang:
+        ease_cubic 0.2 xalign 0.0
+        ease_cubic 0.3 xalign 0.1
+    with hpunch
 
-    "FUCK! Ow!" with hpunch
+    "FUCK! Ow!"
 
     "I can feel a searing heat on my cheek."
 
@@ -461,7 +528,7 @@ label chapter_x9:
     N "I{cps=*.20}...{/cps} {w=0.5}I haven’t changed one bit{cps=*.20}...{/cps}"
 
     show naomi:
-        ease_cubic 0.5 yalign -0.5
+        ease_cubic 0.8 yalign -1.5
     pause 0.2
     hide naomi with dissolve
 
@@ -480,6 +547,8 @@ label chapter_x9:
     N "...Nothing{cps=*.20}...{/cps}"
 
     pause 0.5
+    window hide
+    window auto
     hide fang with dissolve
     hide naomifangcg blur
     show naomifangcg
@@ -557,11 +626,20 @@ label chapter_x9:
     "Oh, Naomi must’ve called a taxi."
 
     scene home fang outside night
-    show naomi sad flip at sleft
+    show naomi sad flip:
+        xalign 0.7
+        ease_cubic 0.8 xalign 0.5
+        pause .2
+        ease_cubic 0.8 xalign 0.3
+        pause .2
+        ease_cubic 0.8 xalign 0.15
+        pause .2
+        ease_cubic 0.8 xalign 0.0
     with fade
     "I crank one eyelid open and see Naomi hesitantly moving to get in the backseat."
 
-    show naomi sad with dissolve
+    show naomi sad with dissolve:
+        xalign 0.0
     "She stops with her hand on the handle."
 
     N "Fang?"
@@ -640,7 +718,7 @@ label chapter_x9:
     "When I turn over to the cool side of my pillow my fingertips brush against the corner of my phone."
 
     "A break{cps=*.20}...{/cps}"
-    show fangphonevideocall call_ended_bg call_ended behind dimmer_lighter at scenter with dissolve:
+    show fangphonevideocall call_ended_bg call_ended behind dimmer_lighter at scenter with easeinbottom:
         yalign -0.045
 
     "Before I can think otherwise, my fingers tap the number I’ve memorized by heart."
@@ -693,6 +771,7 @@ label chapter_x9:
     unknown "ANON I SWEAR TO GOD!"
 
     show fangphonevideocall bgnight anonangry with dissolve
+    with vpunch
     A "EAT A PLATE OF PENISES YOU COPPER PRICK!"
 
     "I can see his face start to turn pink."
@@ -708,14 +787,18 @@ label chapter_x9:
 
     A "Night Lucy."
 
+    window hide
+
     show fangphonevideocall call_ended_bg call_ended with dissolve
     pause 3.0
 
-    show fangphonevideocall call_ended_bg_black call_ended_poff behind dimmer_darker2 at scenter
+    show fangphonevideocall call_ended_bg_black call_ended_poff behind dimmer_darker2
     hide dimmer_lighter
     with dissolve
     pause 0.5
 
+    window auto
+
     hide fangphonevideocall with easeoutbottom
     "My screen fades to black and drops down onto my sheets."
     show fang nonxmas pendant happy behind dimmer_darker2 at scenter
@@ -725,6 +808,8 @@ label chapter_x9:
 
     "{cps=*.20}...{/cps}"
 
+    window hide
+
     stop ambient fadeout 2.0
     stop music fadeout 3.0
     pause 3