From 671ef6486a34b9f219c541e73d49f8c6942c5908 Mon Sep 17 00:00:00 2001 From: nutbuster Date: Fri, 15 Oct 2021 06:17:08 +1100 Subject: [PATCH] Saves Directory change & Changed endings filename --- game/images/ending/{1of4.png => e1of4.png} | Bin game/images/ending/{2of4.png => e2of4.png} | Bin game/images/ending/{3of4.png => e3of4.png} | Bin game/images/ending/{4of4.png => e4of4.png} | Bin game/options.rpy | 2 +- game/screens.rpy | 1 + game/script.rpy | 1 - game/script/14A.KO_OP-ending.rpy | 16 ++++++++-------- game/script/14B.bad-ending.rpy | 2 +- game/script/14C.good-ending.rpy | 2 +- game/script/14D.gold-ending.rpy | 2 +- game/storyline.rpy | 6 +++--- 12 files changed, 16 insertions(+), 16 deletions(-) rename game/images/ending/{1of4.png => e1of4.png} (100%) rename game/images/ending/{2of4.png => e2of4.png} (100%) rename game/images/ending/{3of4.png => e3of4.png} (100%) rename game/images/ending/{4of4.png => e4of4.png} (100%) diff --git a/game/images/ending/1of4.png b/game/images/ending/e1of4.png similarity index 100% rename from game/images/ending/1of4.png rename to game/images/ending/e1of4.png diff --git a/game/images/ending/2of4.png b/game/images/ending/e2of4.png similarity index 100% rename from game/images/ending/2of4.png rename to game/images/ending/e2of4.png diff --git a/game/images/ending/3of4.png b/game/images/ending/e3of4.png similarity index 100% rename from game/images/ending/3of4.png rename to game/images/ending/e3of4.png diff --git a/game/images/ending/4of4.png b/game/images/ending/e4of4.png similarity index 100% rename from game/images/ending/4of4.png rename to game/images/ending/e4of4.png diff --git a/game/options.rpy b/game/options.rpy index 17b501a..d7de694 100644 --- a/game/options.rpy +++ b/game/options.rpy @@ -150,7 +150,7 @@ define config.default_sfx_volume = 0.90 ## This generally should not be changed, and if it is, should always be a ## literal string, not an expression. -define config.save_directory = "DinoGirlGamu-1592542119" +define config.save_directory = "CavemanonSnootGame" ## Icon ######################################################################## diff --git a/game/screens.rpy b/game/screens.rpy index d90498e..d298379 100644 --- a/game/screens.rpy +++ b/game/screens.rpy @@ -1,4 +1,5 @@ ###Updater Python stuff### + init python: if renpy.variant("pc"): #Don't run this on mobile, not supported if persistent.updateresult is None: diff --git a/game/script.rpy b/game/script.rpy index d3d90a4..a272df2 100644 --- a/game/script.rpy +++ b/game/script.rpy @@ -930,7 +930,6 @@ transform wiggle: linear 10.0 yalign 1.0 clockwise circles 1 repeat - label start: $ fangscore = 0 $ anonscore = 0 diff --git a/game/script/14A.KO_OP-ending.rpy b/game/script/14A.KO_OP-ending.rpy index 7e90c7a..015f2df 100644 --- a/game/script/14A.KO_OP-ending.rpy +++ b/game/script/14A.KO_OP-ending.rpy @@ -16,7 +16,7 @@ label chapter_14A: "I pull back the curtain to reveal that a thick Sunday fog had rolled in overnight." "What time is it?" - + "Guess I’ll check my phone{cps=*.1}...{/cps}" show anonphone at scenter with easeinbottom @@ -233,7 +233,7 @@ label chapter_14A: show fang: ease_cubic 1 xalign 0.7 - show fang considering flip with Dissolve(.25) + show fang considering flip with Dissolve(.25) F "It isn’t, Anon." A "But-" @@ -292,7 +292,7 @@ label chapter_14A: "Oh shit, Fang and I are beyond late." pause .5 - + "Wait, where is Fang?" "Her backpack is gone, too." @@ -426,7 +426,7 @@ label chapter_14A: pause .5 stop music1 fadeout 4 - scene hallway + scene hallway show dimmer_lighter with Dissolve(1) pause .5 @@ -631,7 +631,7 @@ label chapter_14A: pause .5 image fangfog = im.Blur(im.MatrixColor("fang/emotive set/fang anguish.png",im.matrix.brightness(-1)), 1.5) - scene roof fog + scene roof fog show fangfog: yanchor 0.5 xanchor 0.5 ypos 0.6 xpos 0.5 @@ -759,7 +759,7 @@ label chapter_14A: pause .5 image red = "#ff0000" - scene a10 + scene a10 show red: alpha 0 block: @@ -815,7 +815,7 @@ label chapter_14A: "End of the line." - hide red + hide red hide dimmer_lighter with Dissolve(2) @@ -1056,7 +1056,7 @@ label chapter_14A: scene black with Dissolve(4) pause 2 - scene 1of4 with Dissolve(2) + scene e1of4 with Dissolve(2) pause scene black with Dissolve(3) diff --git a/game/script/14B.bad-ending.rpy b/game/script/14B.bad-ending.rpy index 4e65cb4..7d92543 100644 --- a/game/script/14B.bad-ending.rpy +++ b/game/script/14B.bad-ending.rpy @@ -327,7 +327,7 @@ label chapter_14B: window hide pause 2 - scene 2of4 with Dissolve(2) + scene e2of4 with Dissolve(2) pause scene black with Dissolve(3) diff --git a/game/script/14C.good-ending.rpy b/game/script/14C.good-ending.rpy index 4c2ad24..90537fb 100644 --- a/game/script/14C.good-ending.rpy +++ b/game/script/14C.good-ending.rpy @@ -739,7 +739,7 @@ label chapter_14C: $ quick_menu = False window hide - scene 3of4 with fade + scene e3of4 with fade stop music fadeout 15.0 pause 16 scene black with fade diff --git a/game/script/14D.gold-ending.rpy b/game/script/14D.gold-ending.rpy index 3a192fd..5389ed9 100644 --- a/game/script/14D.gold-ending.rpy +++ b/game/script/14D.gold-ending.rpy @@ -638,7 +638,7 @@ label chapter_14D: "Our lips meld together as we embrace just like we were teens again." $ quick_menu = False window hide - scene 4of4 with fade + scene e4of4 with fade stop music fadeout 15.0 pause 16 scene black with fade diff --git a/game/storyline.rpy b/game/storyline.rpy index 2b12312..612674a 100644 --- a/game/storyline.rpy +++ b/game/storyline.rpy @@ -1,10 +1,10 @@ init -1 python: def ending_image(): - #0b0000, ABCD, flash the bits with |=, check with & + #0b0000, DCBA, flash the bits with |=, check with & endings = 0b0000 _e = 0b1 for i in range(1, 5): - fn = str(i)+"of4" + fn = "e"+str(i)+"of4" endings |= (_e * renpy.seen_image(fn)) _e = _e << 0b1 persistent.endings = endings @@ -86,6 +86,6 @@ label .ending: pause 20 elif anonscore >= 4 and fangscore >= 4: scene ending_d_cg with Dissolve(1.5) - pause 20 + pause 20 scene black with Dissolve(2) return