From f56c5dc80b544a7dbf61c57557525c8a4d5fc388 Mon Sep 17 00:00:00 2001 From: Bowie Date: Mon, 21 Jun 2021 22:03:37 +0100 Subject: [PATCH] rework canteen opening --- .../1.first-two-days-anon-meets-fang.rpy | 44 +++++++++---------- game/utility.rpy | 13 +----- 2 files changed, 22 insertions(+), 35 deletions(-) diff --git a/game/script/1.first-two-days-anon-meets-fang.rpy b/game/script/1.first-two-days-anon-meets-fang.rpy index e1a0e15..abf0093 100644 --- a/game/script/1.first-two-days-anon-meets-fang.rpy +++ b/game/script/1.first-two-days-anon-meets-fang.rpy @@ -3,9 +3,11 @@ image naser silo = im.Flip(im.MatrixColor("naser/naser neutral.png",im.matrix.br image naomi silo = im.MatrixColor("naomi/naomi neutral.png",im.matrix.brightness(-1)) image naser silo shocked = im.Flip(im.MatrixColor("naser/naser shocked.png",im.matrix.brightness(-1)), horizontal=True) image naomi silo shocked = im.MatrixColor("naomi/naomi shocked.png",im.matrix.brightness(-1)) + # Naser's position when helping Anon get up transform nmidright: xalign 1.5 yalign 0.1 + # Naomi's position when handing the brochure to Anon transform scloserleft: xalign 0.1 yalign 0.0 @@ -109,8 +111,6 @@ label chapter_1: "Ha,{w=0.4} I’m the freakshow among this cereal box mascot crowd." - #(Scrolling Staircase CG here) - "Taking acid is not nearly as colorful as going to Volcano High,{w=0.5} I should write that down." "As I write \"{i}write that down{/i}\" on my phone’s note app,{w=0.3} I noticed the surrounding students stopped looking at me,{w=0.5} which is good." @@ -119,7 +119,7 @@ label chapter_1: "Not like I'll ever be a part of one anyway." - scene stairs at Pan((0,0), (553, 169), 0) with None # make sure we snap here if the player is advancing the dialogue quickly + scene stairs at Pan((553,169), (553, 169), 0) with None # snap here if the player is advancing the dialogue quickly image iris = im.FactorScale(im.MatrixColor("vfx/iris.png",im.matrix.opacity(0.9)), 4.5) window hide show iris: @@ -147,7 +147,7 @@ label chapter_1: "Has she never seen a human in her life?" - "I fucking {cps=*0.2}hate{/cps} that look." + "{cps=*0.4}I fucking hate that look.{/cps}" "Contempt.{w} Judging." @@ -469,7 +469,7 @@ label chapter_1: Tsuki "{cps=*0.6}Puriizu retaano tsu yo shiito,{w=0.3} Anon-kun.{w=0.5} {i}Hai{/i},{w=0.3} nao curassu-{/cps}" - "{cps=*0.7}That was nothing like my Japanese animes.{/cps}" + "{cps=*0.4}That was nothing like my Japanese animes.{/cps}" hide anon neutral with dissolve @@ -502,10 +502,15 @@ label chapter_1: "I thought I had found a decent spot in the corner when disaster struck." show naser neutral behind anon with easeinleft: - xalign -0.2 yalign 0.1 - show anon fear flip: - xalign 0.6 yalign 0.1 + xalign -0.6 yalign 0.1 + show anon fear: + xalign 0.6 yalign 0.1 + easein 0.5 xzoom -1 + show naser neutral: + easein 0.5 xalign -0.2 with MoveTransition(0.5, time_warp=_ease_in_time_warp) + show anon fear flip: + xzoom 1 "Said disaster was a hand grabbing my shoulder and turning me about." @@ -513,9 +518,10 @@ label chapter_1: "I fought the momentum of the tray until the hand that had spun me stabilized it and me." - show anon sad flip behind naser + show anon sad flip behind naser with Dissolve(0.25) + pause 0.5 show naser explanatory - with dissolve + with Dissolve(0.25) Nas "Whoa there!{w=0.7} Nearly dropped your food Anon." @@ -531,7 +537,7 @@ label chapter_1: show naser explanatory with Dissolve(0.25) - Nas "...Yours?" + Nas "...Yours?{fast}" "I swear to all that is good and holy." @@ -562,22 +568,14 @@ label chapter_1: "Before I even sit down the barrage of questions begins." - # image naomi enthusiastic flip: - # im.Flip("naomi/naomi explanatory.png", horizontal=True) - # linear 2.0 yalign 0.1 - # pause 0.5 - # linear 2.0 yalign 0 - # pause 0.5 - # repeat - - # show naomi enthusiastic flip - # show naomi explanatory flip show naomi explanatory flip: ease 0.20 yalign 0.05 ease 0.35 yalign 0.0 repeat - - 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?" # Naomi sees into the future + + # 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?" show naomi neutral flip at sright with ease diff --git a/game/utility.rpy b/game/utility.rpy index b877213..9e056b1 100644 --- a/game/utility.rpy +++ b/game/utility.rpy @@ -1,17 +1,6 @@ ## Utility functions for game setup, debugging etc. -init python: - - def init_stats(anon=0, fang=0, trad=False): - global anonscore - global fangscore - global tradwife - print(anonscore, fangscore, tradwife) - anonscore = anon - fangscore = fang - tradwife = trad - print(anonscore, fangscore, tradwife) - + label initstats(anon=0, fang=0, trad=False): # Sets various game-related global variables # :param int anon: Anon's score