Merge pull request 'revamped credits w/ translators, misc tweaks' (#197) from MapAnon/SnootGame:master into Patch8

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/197

.gitignore

@@ -20,11 +20,15 @@ errors.txt
 traceback.txt
 
 
-#Vim swap files
+#Vim (best text editor) swap files
 .sw?
 *~
 *.bak
 
+#For vscode niggas since gitignore does this for us
+/.vscode/*
+/.vscode/
+
 #save files & cache files
 /game/saves/
 /game/saves/*
@@ -42,9 +46,6 @@ env
 *.pyc
 *.pyo
 
-#Vim (best text editor) swap files
-.sw?
-
 #binary files
 *.rpyc
 *.rpymc

game/screens.rpy

@@ -1239,7 +1239,7 @@ screen extrasnavigation():
     vbox:
         spacing 10
         xpos 1885
-        ypos 1120
+        ypos 1130
         use main_menu_buttons("gui/button/menubuttons/template_idle.png",
             [
                 [ "Help", ShowMenu("help") ],

game/src/credits.rpy

@@ -1,4 +1,3 @@
-
 init python:
 
     #don't do a halo infinite moment
@@ -102,7 +101,7 @@ init python:
     textlist.append(Text(_("Snoot Game"), size=SIZE_SNOT_GAMES, **alignargs))
     textlist.append(Null(1, 16*1))
     textlist.append(Text(_("By CaveManon"), size=SIZE_TITLE, **alignargs))
-    textlist.append(Null(1, 16*12))
+    textlist.append(Null(1, 16*18))
     textlist.append(Text(_("developed in Ren'py"), size=SIZE_ENTRY, **alignargs))
     textlist.append(Null(1, 16*12))
 
@@ -117,7 +116,7 @@ init python:
 
     #smaller font and gridonate for translators
     TL_WIDTH = 2
-    TL_HEIGHT = (len(list_og_credits)+1)//2
+    TL_HEIGHT = (len(list_translator_credits)+1)//2
 
     tgrid = []
 
@@ -143,8 +142,8 @@ init python:
     textlist.append(Null(1, 16*12)) #check
 
     textlist.append(Text(_("T H E  E N D"), size=SIZE_ENDER, **alignargs))
-    textlist.append(Null(1, 16*18))
+    textlist.append(Null(1, 16*4))
-    textlist.append(Text(_("Snoot game started development\n on June 19 2020"), size=SIZE_ENTRY, **alignargs))
+    textlist.append(Text(_("Snoot game started development\n on June 19, 2020"), size=SIZE_ENTRY, **alignargs))
 
     credits_hbox = Fixed(VBox(*textlist, xalign=0.5), xalign=0.5)
     renpy.image('credits_hbox', credits_hbox)
@@ -152,17 +151,40 @@ init python:
 
 #slack: 2000
 
-image s_credits = Composite(
-    (1920, 11000+1000),
-    (0, 0), "credits_base",
-    (0, 0), "credits_hbox",
-    (0, 10060+1000), "d_sketch"
-)
-
 label test_credits:
+    scene black
+    stop ambient
+    #play music '<loop 12.809525>audio/abloop.wav'
     "test"
-    show s_credits at Pan((0, -500),(0, 9850+1000), 65) with fade
+    window auto hide
-    #show credits_hbox at Pan((0, -500),(0, 9850), 65) with fade
+
+    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
+
+    #pause 50
+    #queue music "audio/abend.wav" noloop
+
 
     pause
     scene black with Dissolve(3)

game/src/translation.rpy

@@ -74,7 +74,7 @@ init python:
                         for lb in LangCave.lang_buttons:
                             lb.selected = False
                         self.selected = True
-                        onclick_audio(True)
+                        onclick_audio(False)
                         self.value() #todo: change to function, as value doesn't make sense
 
                         if LangCave.on_disable_interactable:

game/storyline.rpy

@@ -54,38 +54,93 @@ label storyline:
     call .ending
     return
 
-image b_credits = Composite(
+
-    (1920, 11000+2000),
+    image credits_coverup:
-    (0, 0), "credits_base",
+        "black"
-    (0, 0), "credits_hbox",
+        crop (0, 0, 1920, 1080)
-    (0, 10060+2000), "b_sketch"
+
+    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"
     )
 
-image c_credits = Composite(
+# Anytime the credits changes to include more translators, you're just going to have to guess what the correct
-    (1920, 11000+1000),
+# value to offset everything is again. Mainly concerning values that control the panning destination of credits text, 
-    (0, 0), "credits_base",
+# and the height of the credits text itself
-    (0, 0), "credits_hbox",
+# Remember, ending sketch is always +550 of when the Pan stops
-    (0, 10060+1000), "c_sketch"
-)
 
-image d_credits = Composite(
-    (1920, 11000+1000),
-    (0, 0), "credits_base",
-    (0, 0), "credits_hbox",
-    (0, 10060+1000), "d_sketch"
-)
 
 
 label .ending:
     call get_ending
+    #I know, horrifying copy and paste
     if _return == 4:
-        show d_credits at Pan((0, -800),(0, 9850+1000), 65) with fade
+        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
+
+        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"
-        show c_credits at Pan((0, -800),(0, 9850+1000), 65) with fade
+        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"
-        show b_credits at Pan((0, -800),(0, 9850+2000), 65) with fade
+        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)