finish canteen rework

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

@@ -569,13 +569,13 @@ label chapter_1:
     "Before I even sit down the barrage of questions begins."
 
     show naomi explanatory flip:
-        ease 0.20 yalign 0.05
+        ease 0.18 yalign 0.05
         ease 0.35 yalign 0.0
         repeat
     
     # TODO: prevent Naomi from seeing into the future
     # e.g "Did you met Spears yet?"
-    N "SO!{w=0.5} How’d it go!{w=0.4} Did you like Spears?{w=0.4} Were you able to get what you need?"
+    N "SO!{w=0.5} How’d it go!{w=0.3} Did you like Spears?{w=0.3} Were you able to get what you need?"
 
     show naomi neutral flip at sright with ease
 
@@ -585,9 +585,9 @@ label chapter_1:
 
     A "Not really."
 
-    A "All these introductions,{w=0.3} you know?"
+    A "All these introductions,{w=0.2} you know?"
 
-    Nas "I get you,{w=0.4} hard to talk to people you don’t know,{w=0.3} right?"
+    Nas "I get you,{w=0.5} hard to talk to people you don’t know,{w=0.2} right?"
 
     A "Something like that,{w=0.4} yeah."
 
@@ -599,23 +599,31 @@ label chapter_1:
 
     show naomi explanatory flip
 
+    show naomi explanatory flip:
+        ease 0.18 yalign 0.04
+        ease 0.35 yalign 0.0
+        repeat
+
     N "Have you had any trouble since then?{w=0.5} Do you have enough money for food today?"
 
+    show naomi neutral flip at sright with ease
+
     show naomi neutral flip
     show naser neutral flip
     with Dissolve(0.25)
 
-    Nas "Oh,{w=0.4} you’re short on food money man?"
+    Nas "Oh,{w=0.25} you’re short on food money man?"
 
-    show naser flip unimpressed
+    # TODO: temporarily commented out as this seems to be repeated with different wording a moment later. Intentional?
-    show naomi flip sad
+    # show naser flip unimpressed
-    with dissolve
+    # show naomi flip sad
+    # with dissolve
 
-    "I perk up at Naser’s interjection. Naomi looks disappointed for a second."
+    # "I perk up at Naser’s interjection. Naomi looks disappointed for a second."
 
-    show naomi neutral flip with dissolve
+    A "Not really,{w=0.4} just had to sign up for some handouts."
 
-    A "Not really, just had to sign up for some handouts."
+    show naomi sad flip with dissolve
 
     "Naomi is starting to look disappointed I’m only picking up on Naser’s interjections"
 
@@ -642,7 +650,11 @@ label chapter_1:
 
     A "I uh{cps=*0.1}...{/cps} dunno about concerts.{w=0.6} Not really one for public events like that."
 
-    Nas "Alright man,{w=0.3} just thought you could use a few opportunities to make friends."
+    show naser unimpressed flip
+
+    Nas "Alright man,{w=0.4} just thought you could use a few opportunities to make friends."
+
+    show naser neutral flip
 
     "What was that?"
 
@@ -650,7 +662,8 @@ label chapter_1:
 
     A "{cps=*0.4}I’ll consider it.{/cps}"
 
-    show naomi sad flip with dissolve
+    show naomi:
+        easein 0.4 xalign 0.9
 
     N "Hey! Don’t leave me out of the conversation!"
 
@@ -662,11 +675,14 @@ label chapter_1:
 
     "My stomach roils at the V-word."
 
-    A "Maaaaybe another time, sorry. So about that concert Naser?"
+    A "{cps=*0.25}Maaaaybe{/cps} another time,{w=0.2} sorry.{w=0.6} So about that concert Naser?"
 
     show naomi sad flip with dissolve
+    pause 0.5
 
-    "Dinner and a show? Sign me the fuck up."
+    "Dinner and a show?{w=0.5} Sign me the fuck up." #TODO: Anon "signs the fuck up" twice
+
+    show naomi neutral flip
     
     A "So what do they play?"
 
@@ -675,48 +691,57 @@ label chapter_1:
     A "Music?"
 
     Nas "Yes."
-    show naomi neutral flip
+
     A "What kind?"
 
     Nas "The kind you listen to."
 
-    A "Wh- Well what genre?"
+    A "Wh-{w=0.3} Well what genre?"
 
     Nas "The good kind?"
 
-    A "You don’t know, do you."
+    A "You don’t know,{w=0.3} do you."
 
     Nas "Nope."
 
-    "Well, free food is free food. Sign me the fuck up"
+    "Well,{w=0.3} free food is free food.{w=0.5} Sign me the fuck up"
 
-    "I look at my pizza, noticing something is wrong."
+    "I look at my pizza,{w=0.3} noticing something is wrong."
 
     "I test it with my plastic spork and watch the cheap utensil shatter to bits."
 
     "I curse life for a third time today."
 
-    "The dreaded ten-minute mark has passed, rendering my ‘pizza’ only useful as building material."
+    "The dreaded ten-minute mark has passed,{w=0.35} rendering my ‘pizza’ only useful as building material."
 
-    show naomi happy flip with dissolve
+    show naomi happy flip with Dissolve(0.25)
 
-    N "Oh dear. Naser why don’t you split your sandwich with him?"
+    N "Oh dear.{w=0.6} Naser why don’t you split your sandwich with him?"
 
-    show naser annoyed flip with dissolve
+    show naser annoyed flip with Dissolve(0.25)
 
     Nas "But it’s my sandwich!"
 
-    N "It’s fine, we can split my vegan TLT!"
+    N "It’s fine,{w=0.3} we can split my vegan TLT!"
 
     show naser sad flip with dissolve
 
     "Naser shudders and looks at his own footlong philly sub longingly."
 
-    Nas "S-sure thing, babe."
+    Nas "S{w=0.1}-sure thing,{w=0.3} babe."
+
+    window hide
+
+    show naomi neutral flip with dissolve
+    show naser:
+      easein 0.2 xalign 0.62
+      pause 0.75
+      ease 0.75 xalign 0.4
+    pause 2.5
 
     "He tears the sandwich in two and hands me the larger half."
 
-    Nas "Here, Anon."
+    Nas "Here,{w=0.35} Anon."
 
     "I will never forget your brave sacrifice."
 
@@ -726,7 +751,7 @@ label chapter_1:
 
     scene black with fade
 
-    "--After school--"
+    "{cps=*0.2}--After school--{/cps}"
 
     "My classes after lunch were the same as before it."