From 626729bd0f9b91ef1954ac3989417a5cbb07344d Mon Sep 17 00:00:00 2001 From: nutbuster Date: Thu, 3 Nov 2022 20:23:15 +1100 Subject: [PATCH] definitions, json & undefining golden ending dupe --- game/script.rpy | 2 +- .../11.school-assignment-and-route-lock.rpy | 2 + game/script/12C.anon-fang-lovey-dovey.rpy | 18 +++-- ...eak-up-while-she-thinks-about-her-life.rpy | 4 + game/script/14A.KO_OP-ending.rpy | 2 + game/script/14C.good-ending.rpy | 6 ++ ...and-anon-cut-class-to-talk-on-the-roof.rpy | 4 + .../script/8.anon-and-fang-study-together.rpy | 4 + game/src/definitions.rpy | 81 +++++++++++++++++++ game/src/gallery_dataset.json | 25 ++++++ game/storyline.rpy | 2 +- game/tl/es/common.rpy | 2 +- 12 files changed, 142 insertions(+), 10 deletions(-) create mode 100644 game/src/definitions.rpy create mode 100644 game/src/gallery_dataset.json diff --git a/game/script.rpy b/game/script.rpy index e21f53d..3ae1499 100644 --- a/game/script.rpy +++ b/game/script.rpy @@ -826,7 +826,7 @@ image naomi prom lessblurred = im.Flip(im.Blur('images/naomi/naomi prom neutral. #image naomifangcg = "images/cgs/naomifangcg.png" image naomifangcg blur = im.Blur("images/cgs/naomifangcg.jpg", 1.5) image naomiletter = 'images/cgs/naomiletter.jpg' -image ending_d_cg = 'images/cgs/golden ending.jpg' +#image ending_d_cg = 'images/cgs/golden ending.jpg' image photoviewfinder = 'images/other/photoviewfinder.png' diff --git a/game/script/11.school-assignment-and-route-lock.rpy b/game/script/11.school-assignment-and-route-lock.rpy index e680e8c..bfa52f4 100644 --- a/game/script/11.school-assignment-and-route-lock.rpy +++ b/game/script/11.school-assignment-and-route-lock.rpy @@ -2311,6 +2311,8 @@ label chapter_11: with Dissolve(1) pause .5 + $ renpy.seen_image('fullbody_fangarm') + "She lays her head on my arm, very carefully. It was fast becoming her preferred pillow here." pause .5 diff --git a/game/script/12C.anon-fang-lovey-dovey.rpy b/game/script/12C.anon-fang-lovey-dovey.rpy index 1da8d6b..a7f5461 100644 --- a/game/script/12C.anon-fang-lovey-dovey.rpy +++ b/game/script/12C.anon-fang-lovey-dovey.rpy @@ -45,6 +45,8 @@ label chapter_12C: show kissu1 with dissolve + $ renpy.seen_image('fullbody_kissu1') + Lucy "You're so good to me." A "Thanks. F- Lucy." @@ -206,6 +208,8 @@ label chapter_12C: with Dissolve(1) pause .5 + $ renpy.mark_image_seen('fullbody_kissu2') + Lucy "See? Getting better." A "Mmm…" @@ -214,7 +218,7 @@ label chapter_12C: window hide window auto pause .5 - + scene black with Dissolve(1) pause 0.5 A "Y-yeah,{w=0.2} same." @@ -262,7 +266,7 @@ label chapter_12C: with Dissolve(0.25) pause 3.0 scene sepiagarden - show grain_effect + show grain_effect show sepiastella explanatory flip behind grain_effect at sright: xalign 0.8 show sepiaanon neutral behind grain_effect at acenter: @@ -278,7 +282,7 @@ label chapter_12C: A "{i}Right, right. Lunar eclipse. Is that the one where you can’t see the Moon or the one where you can’t see the sun?{/i}" - show sepiastella unimpressed flip with dissolve + show sepiastella unimpressed flip with dissolve St "{i}*sigh*{/i}" St "{i}It’s also called a Blood Moon for its color?{/i}" @@ -298,7 +302,7 @@ label chapter_12C: with dissolve Ro "{i}Oh, yes!{/i}" - + Ro "{i}My backyard is very big. Long bus ride to school.{/i}" Ro "{i}But I see the stars at night so well, so Stella has slumber parties often!{/i}" @@ -500,7 +504,7 @@ label chapter_12C: pause 0.5 St "Eventide draws near. I believe it best we sojourn from the fated ones, Rosa. My scrying glass awaits." - + pause 0.5 show fang neutral behind rosa show rosa considering @@ -896,5 +900,5 @@ label chapter_12C: window hide window auto pause 1 - - return \ No newline at end of file + + return diff --git a/game/script/13D.fang-plays-well,-naomi-jealous,-fang-talks-to-anon-to-break-up-while-she-thinks-about-her-life.rpy b/game/script/13D.fang-plays-well,-naomi-jealous,-fang-talks-to-anon-to-break-up-while-she-thinks-about-her-life.rpy index d95fb2e..9d85e62 100644 --- a/game/script/13D.fang-plays-well,-naomi-jealous,-fang-talks-to-anon-to-break-up-while-she-thinks-about-her-life.rpy +++ b/game/script/13D.fang-plays-well,-naomi-jealous,-fang-talks-to-anon-to-break-up-while-she-thinks-about-her-life.rpy @@ -2465,6 +2465,8 @@ label chapter_13D: with dissolve pause 1 + $ renpy.seen_image('fullbody_dpromdance') + A "Alright, I think she said like this{cps=*.1}...{/cps}" show fanganon_promdance: @@ -3310,6 +3312,8 @@ label chapter_13D: with Dissolve(1) pause 1 + $ renpy.seen_image('fullbody_christmas') + "I’m sitting in my bed, looking through one of my favorite presents." "Fang’s mom was right, I am happy about all those photos." diff --git a/game/script/14A.KO_OP-ending.rpy b/game/script/14A.KO_OP-ending.rpy index 0895d24..95a3d0a 100644 --- a/game/script/14A.KO_OP-ending.rpy +++ b/game/script/14A.KO_OP-ending.rpy @@ -854,6 +854,8 @@ label chapter_14A: ypos 0 with Dissolve(2) + $ renpy.seen_image('fullbody_fang_shooter') + F "A-Anon{cps=*.1}...{/cps} WHY ARE YOU-!" A "Aaaah{cps=*.1}...{/cps}{w=.4} haaaah{cps=*.1}...{/cps} Fang{cps=*.1}...{/cps}{w=.4} why{cps=*.1}...{/cps}?" diff --git a/game/script/14C.good-ending.rpy b/game/script/14C.good-ending.rpy index 15e0813..7a02f3c 100644 --- a/game/script/14C.good-ending.rpy +++ b/game/script/14C.good-ending.rpy @@ -796,6 +796,8 @@ label chapter_14C: with Dissolve(1) pause 1 + $ renpy.seen_image('fullbody_c06') + "I draw Lucy close to my chest." "She snuggles up to me." @@ -862,6 +864,8 @@ label chapter_14C: with dissolve pause 1 + $ renpy.seen_image('fullbody_c07') + "I embrace her, I could tell she was getting tense, but slowly she relaxes in my arms." "When I said that we're being together was all that mattered, she hugged me back." @@ -979,6 +983,8 @@ label chapter_14C: show c09 with Dissolve(1) pause 1.25 + $ renpy.seen_image('fullbody_c09') + A "Urgh-- it's ok, Lucy." pause .5 diff --git a/game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy b/game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy index 91501fc..8880cc8 100644 --- a/game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy +++ b/game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy @@ -3865,6 +3865,8 @@ label chapter_5: show fanganonhug with dissolve + $ renpy.seen_image('fullbody_fanganonhug') + "Without a second thought I draw her into a hug, comforting her." "Her voice is muffled by my jacket but she continues." @@ -4203,6 +4205,8 @@ label chapter_5: with Dissolve(1) pause .5 + $ renpy.seen_image('fullbody_hallpass') + "She takes it from my hands, our fingers brushing for a second." "She blushes while she handles the acoustic bathroom pass." diff --git a/game/script/8.anon-and-fang-study-together.rpy b/game/script/8.anon-and-fang-study-together.rpy index 0571177..27d78ae 100644 --- a/game/script/8.anon-and-fang-study-together.rpy +++ b/game/script/8.anon-and-fang-study-together.rpy @@ -576,6 +576,8 @@ label chapter_8: with dissolve pause 0.5 + $ renpy.seen_image('fullbody_fangguitar') + F "Uhm{cps=*.1}...{/cps} This is just how I get ready for studying." F "Strumming along puts me at ease." @@ -702,6 +704,8 @@ label chapter_8: with dissolve pause .5 + $ renpy.seen_image('fullbody_fanganonguitar') + "She’s standing RIGHT THE FUCK BEHIND ME!" pause .5 diff --git a/game/src/definitions.rpy b/game/src/definitions.rpy new file mode 100644 index 0000000..1660ec5 --- /dev/null +++ b/game/src/definitions.rpy @@ -0,0 +1,81 @@ + +init offset = 1 #load later than the scripts folder +#dpromdance + +# fang full body + +image fullbody_hallpass = Composite( + (1920, 1080), + (0, 0), 'roof day', + (0, 0), 'hallpass') + +image fullbody_fangguitar = Composite( + (1920, 1080), + (0, 0), 'fangroom', + (0, 0), 'fangguitar') + + +#full body fang anon wombo + +image fullbody_fangarm = Composite( + (1920, 1080), + (-771, 0), 'room anon day alt', #check + (213, 0), 'fangarm') + +image fullbody_fanganonguitar = Composite( + (1920, 1080), + (0, 0), 'fangroom', + (213, 0), 'fanganonguitar') + +#path to true ending only +image fullbody_fanganonhug = Composite( + (1920, 1080), + (0, 0), 'roof day', + (0, 0), 'fanganonhug') + +#crops +image fullbody_kissu1 = Composite( + (1920, 1080), + (0, 0), 'room anon night', + (-529, 0), 'kissu1') + +image fullbody_kissu2 = Composite( + (1920, 1080), + (0, 0), 'room anon day', + (213, 0), 'kissu2') + +# ENDING 4 + +image fullbody_dpromdance = Composite( + (1920, 1080), + (0, 0), 'park_night', + (0, 0), 'dpromdance') + +image fullbody_christmas = Composite( + (1920, 1080), + (0, 0), 'room anon day', + (0, 0), 'anonchristmasmorning') + +# ENDING 3 + +image fullbody_c06 = Composite( + (1920, 1080), + (0, 0), 'park night', + (0, 0), 'c06') + +image fullbody_c07 = Composite( + (1920, 1080), + (0, 0), 'park night', + (0, 0), 'c07') + +image fullbody_c09 = Composite( + (1920, 1080), + (0, 0), 'city morning', + (0, 0), 'c09') + +# ENDING 1 + +image fullbody_fang_shooter = Composite( + (1920, 1080), + (0, 0), 'shooterroof', + (0, 0), 'fang shooter') diff --git a/game/src/gallery_dataset.json b/game/src/gallery_dataset.json new file mode 100644 index 0000000..d4d0a65 --- /dev/null +++ b/game/src/gallery_dataset.json @@ -0,0 +1,25 @@ +{ + { + "tab_name": "Full Body Fang", + "items": { + { "name": "hallpass", "image": "fullbody_hallpass" }, + { "name": "fangguitar", "image": "fullbody_fangguitar" }, + { "name": "fangshooter", "image": "fullbody_fangshooter" } + } + }, + { + tab_name: "Full Body Fang & Anon", + "items": { + { "name": "fanganonhug", "image": "fullbody_fanganonhug" }, + { "name": "fanganonguitar", "image": "fullbody_fanganonguitar" }, + { "name": "fangarm", "image": "fullbody_fangarm" }, + { "name": "kissu1", "image": "fullbody_kissu1" }, + { "name": "kissu2", "image": "fullbody_kissu2" }, + { "name": "c06", "image": "fullbody_c06" }, + { "name": "c07", "image": "fullbody_c07" }, + { "name": "c09", "image": "fullbody_c09" }, + { "name": "anonchristmasmorning", "image": "fullbody_christmas" } + } + } +} + diff --git a/game/storyline.rpy b/game/storyline.rpy index 9c841d5..84b2354 100644 --- a/game/storyline.rpy +++ b/game/storyline.rpy @@ -89,7 +89,7 @@ label .ending: scene black with Dissolve(2) pause 1 elif anonscore >= 4 and fangscore >= 4: - scene ending_d_cg with Dissolve(1.5) + scene golden ending with Dissolve(1.5) pause 20 scene black with Dissolve(2) pause 1 diff --git a/game/tl/es/common.rpy b/game/tl/es/common.rpy index ba61448..010e108 100644 --- a/game/tl/es/common.rpy +++ b/game/tl/es/common.rpy @@ -1,6 +1,6 @@ # TODO: Translation updated at 2022-10-21 13:48 -translate test strings: +translate es strings: # renpy/common/00accessibility.rpy:28 old "Self-voicing disabled."