From f9f1501e203896ee48351b73f2d8810beea00cbd Mon Sep 17 00:00:00 2001 From: Map Date: Tue, 22 Nov 2022 18:18:21 -0600 Subject: [PATCH] actually fixed credits, moved credits code --- game/src/credits.rpy | 141 +++++++++++++++++++++++++++++++++++++------ game/storyline.rpy | 101 +------------------------------ 2 files changed, 122 insertions(+), 120 deletions(-) diff --git a/game/src/credits.rpy b/game/src/credits.rpy index 0670152..e982aca 100644 --- a/game/src/credits.rpy +++ b/game/src/credits.rpy @@ -70,10 +70,11 @@ init python: _('Character Design\nContest Winner:'): [ 'Mono Anon', ], - _('Special Thanks:'): [ + _('Special Thanks:'): [ 'Commission Anon', - ], + ] } + # The difference between adding in the special thanks and not I have found is about 480px, just to note down. list_translator_credits = { _('Translators (Spanish):'): [ @@ -152,6 +153,10 @@ init python: renpy.image('credits_hbox', credits_hbox) # + + + + #slack: 2000 label test_credits: @@ -162,28 +167,17 @@ label test_credits: window auto hide pause 0.5 - show snootgame_big with dissolve: # Renpy not allowing you to grab images from the gui folder is serious bullshit - subpixel True - xalign 0.5 - yalign 0.5 - linear 6 zoom 1.2 - pause 1.75 - show d_credits_text with dissolve: - crop (0, 670, 1920, 100000) - ypos 670 - pause 2 - - hide d_credits_text - hide snootgame_big - with dissolve - + show c_credits_text: + crop (0, 0, 1920, 670) + pause 1.1 + show c_credits_text: + crop None + pause 2.75 show credits_base at Pan((0, -1080),(0, 8100), 65) behind c_credits_text: subpixel True - show d_credits_text at Pan((0, 0),(0, 11675), 65): + show c_credits_text at Pan((0, 0),(0, 12155), 65): crop None subpixel True - show credits_coverup at Pan((0, 0),(0, 11675), 65): - subpixel True #pause 50 #queue music "audio/abend.wav" noloop @@ -191,3 +185,110 @@ label test_credits: pause scene black with Dissolve(3) + + +# Credits definitions moved here so everything that needs to be changed is is one place. + +# Anytime the credits changes to include more translators, you're just going to have to guess what the correct +# value to offset everything is again. Mainly concerning values that control the panning destination of credits text, +# and the height of the credits text itself +# My recommendation is to imagine a square on top of the "T" in "THE END" +# The square is as long as one of those characters, and the top of the square should touch the top of the screen +# when the credits stop scrolling +# Someone please come up with an exact formula pls + +# Remember, ending sketch is always +550 of when the Pan stops + +image credits_coverup: + "black" + crop (0, 0, 1920, 1080) + +image b_credits_text = Composite( + (1920, 13235), + (0, 390), "credits_hbox", + (0, 12705), "b_sketch" +) +image c_credits_text = Composite( + (1920, 13235), + (0, 390), "credits_hbox", + (0, 12705), "c_sketch" +) +image d_credits_text = Composite( + (1920, 13235), + (0, 390), "credits_hbox", + (0, 12705), "d_sketch" +) + + +label .ending: + call get_ending + #I know, horrifying copy and paste + if _return == 4: + pause 0.5 + show snootgame_big with dissolve: # Renpy not allowing you to grab images from the gui folder is serious bullshit + subpixel True + xalign 0.5 + yalign 0.5 + linear 6 zoom 1.2 + pause 1.75 + show d_credits_text with dissolve: + subpixel True + crop (0, 670, 1920, 1080) + ypos 670 + xalign 0.5 + linear 3 zoom 1.1 + pause 2 + + hide d_credits_text + hide snootgame_big + with dissolve + + show credits_base at Pan((0, -1080),(0, 8100), 5): + subpixel True + show d_credits_text at Pan((0, 0),(0, 12155), 5): + subpixel True + show credits_coverup at Pan((0, 0),(0, 12155), 5): + subpixel True + elif _return == 3: + play music "audio/OST/Dino Destiny Reader.ogg" + pause 0.5 + show c_credits_text: + crop (0, 0, 1920, 670) + pause 1.1 + show c_credits_text: + crop None + pause 2.75 + show credits_base at Pan((0, -1080),(0, 8100), 65) behind c_credits_text: + subpixel True + show c_credits_text at Pan((0, 0),(0, 12155), 65): + crop None + subpixel True + else: + play music "audio/OST/Dino Destiny Reader.ogg" + pause 0.5 + show b_credits_text: + crop (0, 0, 1920, 670) + pause 1.1 + show b_credits_text: + crop None + pause 2.75 + show credits_base at Pan((0, -1080),(0, 8100), 65) behind b_credits_text: + subpixel True + show b_credits_text at Pan((0, 0),(0, 12155), 65): + crop None + subpixel True + pause + stop music fadeout 5 + scene black with Dissolve(3) + pause 2 + if tradwife: + scene c10 with Dissolve(1.5) + pause 20 + scene black with Dissolve(2) + pause 1 + elif anonscore >= 4 and fangscore >= 4: + scene golden ending with Dissolve(1.5) + pause 20 + scene black with Dissolve(2) + pause 1 + return diff --git a/game/storyline.rpy b/game/storyline.rpy index d59a133..c224fc9 100644 --- a/game/storyline.rpy +++ b/game/storyline.rpy @@ -52,103 +52,4 @@ label storyline: $ renpy.quit() $ ending_image() call .ending - return - - - image credits_coverup: - "black" - crop (0, 0, 1920, 1080) - - image b_credits_text = Composite( - (1920, 12800), - (0, 390), "credits_hbox", - (0, 12225), "b_sketch" - ) - image c_credits_text = Composite( - (1920, 12800), - (0, 390), "credits_hbox", - (0, 12225), "c_sketch" - ) - image d_credits_text = Composite( - (1920, 12800), - (0, 390), "credits_hbox", - (0, 12225), "d_sketch" - ) - -# Anytime the credits changes to include more translators, you're just going to have to guess what the correct -# value to offset everything is again. Mainly concerning values that control the panning destination of credits text, -# and the height of the credits text itself -# Remember, ending sketch is always +550 of when the Pan stops - - - -label .ending: - call get_ending - #I know, horrifying copy and paste - if _return == 4: - pause 0.5 - show snootgame_big with dissolve: # Renpy not allowing you to grab images from the gui folder is serious bullshit - subpixel True - xalign 0.5 - yalign 0.5 - linear 6 zoom 1.2 - pause 1.75 - show d_credits_text with dissolve: - crop (0, 670, 1920, 100000) - ypos 670 - pause 2 - - hide d_credits_text - hide snootgame_big - with dissolve - - show credits_base at Pan((0, -1080),(0, 8100), 65) behind c_credits_text: - subpixel True - show d_credits_text at Pan((0, 0),(0, 11675), 65): - crop None - subpixel True - show credits_coverup at Pan((0, 0),(0, 11675), 65): - subpixel True - elif _return == 3: - play music "audio/OST/Dino Destiny Reader.ogg" - pause 0.5 - show c_credits_text: - crop (0, 0, 1920, 670) - pause 1.1 - show c_credits_text: - crop None - pause 2.75 - show credits_base at Pan((0, -1080),(0, 8100), 65) behind c_credits_text: - subpixel True - show c_credits_text at Pan((0, 0),(0, 11675), 65): - crop None - subpixel True - else: - play music "audio/OST/Dino Destiny Reader.ogg" - pause 0.5 - show b_credits_text: - crop (0, 0, 1920, 670) - pause 1.1 - show b_credits_text: - crop None - pause 2.75 - show credits_base at Pan((0, -1080),(0, 8100), 65) behind c_credits_text: - subpixel True - show b_credits_text at Pan((0, 0),(0, 11675), 65): - crop None - subpixel True - pause - stop music fadeout 5 - scene black with Dissolve(3) - pause 2 - if tradwife: - scene c10 with Dissolve(1.5) - pause 20 - scene black with Dissolve(2) - pause 1 - elif anonscore >= 4 and fangscore >= 4: - scene golden ending with Dissolve(1.5) - pause 20 - scene black with Dissolve(2) - pause 1 - return + return \ No newline at end of file