Merge pull request 'Add icon for macOS' (#256) from Pomi108/SnootGame:mac-icon into master

Reviewed-on: https://git.cavemanon.xyz/Cavemanon/SnootGame/pulls/256
Reviewed-by: Mappening <mapanon@noreply.git.cavemanon.xyz>

.gitignore

@@ -15,10 +15,12 @@ ehthumbs_vista.db
 /traceback.txt
 /errors.txt
 /log.txt
+/files.txt
+project.json
 log.txt
 errors.txt
 traceback.txt
-
+files.txt
 
 #Vim (best text editor) swap files
 .sw?

game/screens.rpy

@@ -905,7 +905,7 @@ screen preferences():
                     textbutton _("Enable Chapter Select") action ToggleVariable("persistent.enable_chapter_select", True, False)
 
                 if not main_menu:
-                    if config.developer and persistent.enable_debug_scores:
+                    if persistent.enable_debug_scores:
                         $ debug_story_variables(False)
                         $ debug_story_variables(True)
                     else:
@@ -945,7 +945,6 @@ screen preferences():
                             scrollbars "vertical"
                         for lang in languages:
                             fixed:
-                                xsize 656
                                 ysize 60
                                 use lang_button(lang)
 
@@ -1774,12 +1773,13 @@ style pref_vbox:
 ## that uses fewer and bigger buttons that are easier to touch.
 
 #redefine function
-screen quick_button(filename, label, function):
+screen quick_button(filename, label, function=NullAction(), function2=NullAction()):
     variant "mobile"
     button:
         xmaximum 124
         ymaximum 124
         action function
+        alternate function2
         fixed:
             add filename xalign 0.5 yalign 0.5 zoom 1.75
             text label xalign 0.5 yalign 0.5 size 42 style "quick_button_text"

game/script/11.school-assignment-and-route-lock.rpy

@@ -5244,7 +5244,7 @@ label chapter_11:
     window auto
     pause .5
 
-    scene classroom
+    scene science class
     show anon neutral:
         yalign 0.1 xalign 0.2
     show fang neutral behind anon:

game/script/7.concert-day.rpy

@@ -265,19 +265,19 @@ label chapter_7:
     #Decided to take the unholy if/else approach to this, if there is a better, cleaner, or faster way to do it then do point me to it.
     #Values here were decided by writers, not me
 
-    if anonscore >= 3 and fangscore >= 4:
+    if (anonscore >= 3 and fangscore >= 4) or ending_route_number == 4:
     #>>golden
         St "Upright Strength."
         St "OH! {w=.3} I don’t think you need to worry about what’s to come, Anon."
-    elif anonscore >= 3 and fangscore <= 3:
+    elif (anonscore >= 3 and fangscore <= 3) or ending_route_number == 3:
     #>>tradwife
         St "Inverted Hierophant."
         St "You need to be wary of your words and actions, Anon."
-    elif anonscore <= 3 and fangscore >= 3:
+    elif (anonscore <= 3 and fangscore >= 3) or ending_route_number == 2:
     #>>doomer
         St "Inverted Hermit."
         St "Anon, if you ever feel lonely you can come to me."
-    elif anonscore <= 2 and fangscore <= 2:
+    elif (anonscore <= 2 and fangscore <= 2) or ending_route_number == 1:
     #>>shooter
         St "Oh my, {w=.3} inverted Empress."
         St "You need to be wary about future negligence, Anon."

game/script/8.anon-and-fang-study-together.rpy

@@ -1525,7 +1525,7 @@ label chapter_8:
 
         "{cps=*.1}...{/cps}"
 
-        if anonscore >= 3 or fangscore >= 3:
+        if (anonscore >= 4 and fangscore >= 4) or ending_route_number == 4:
             pause 0.5
             play music 'audio/OST/its_footloose_now.ogg' fadein 1.0
 

game/src/cg_gallery.rpy

@@ -118,10 +118,9 @@ screen cg_gallery(origin = 'CG'):
         transform:
             zoom 0.95
             hbox:
-                style_prefix "navigation"
                 xalign 0.5
 
-                spacing gui.navigation_spacing
+                spacing 80
 
                 for cp in CG_PATHS:
                     if cp['name'] == origin:
@@ -197,7 +196,7 @@ screen view_movie(item, _origin):
             yalign 0.975
             use quick_buttons("gui/button/uioptionbuttons/template_idle.png",
                 [
-                    [ "Return", _origin ]
+                    [ _("Return"), _origin, NullAction() ]
                 ] )
 
 
@@ -229,6 +228,6 @@ screen view_image(item, _origin):
             yalign 0.975
             use quick_buttons("gui/button/uioptionbuttons/template_idle.png",
                 [
-                    [ "Return", _origin ]
+                    [ _("Return"), _origin, NullAction() ]
                 ] )
 

game/src/credits.rpy

@@ -238,7 +238,7 @@ init python:
     # Note: Measuring in pixels
     panning_stop = 13290 # How far the panning will go down
     panning_stop_bg = 8100 # How far the background images will pan, to create the parallax effect (I can't believe cuckedmanon didn't like this!)
-    panning_duration = 65 # How long in seconds
+    panning_duration = 67 # How long in seconds
     credits_img_offset = panning_stop + 550 # Distance away from panning_stop where the image will render
     credits_img_boundary = credits_img_offset + 590 # The offset + the height of the credits image file
 

game/src/storyline.rpy

@@ -1,4 +1,6 @@
 init -1 python:
+    # This function name is a misnomer, this actually counts endings as seen when the player reaches the ending cards when this is called 
+    # And it's done in the most retarded way possible because someone thought it'd be funny.
     def ending_image():
         #0b0000, DCBA, flash the bits with |=, check with &
         endings = 0b0000
@@ -26,7 +28,7 @@ init python:
 
         # We're at an ending
         else:
-            ending_image()
+            ending_image() # Count endings that have seen the ending cards as seen
 
             if ending_route_number == 1:
                 renpy.quit()

game/tl/es/common.rpy

@@ -1220,3 +1220,259 @@ translate es strings:
     # renpy/common/00gamepad.rpy:58
     old "Press or move the '[control!s]' [kind]."
     new "Presiona o mueve el '[control!s]' [kind]."
+# TODO: Translation updated at 2023-04-30 19:56
+
+translate es strings:
+
+    # renpy/common/00action_other.rpy:703
+    old "Open [text] directory."
+    new "abrir directorio [text]."
+
+    # renpy/common/00preferences.rpy:507
+    old "audio when minimized"
+    new "audio cuando está minimizado"
+
+    # renpy/common/00preferences.rpy:527
+    old "main volume"
+    new "volumen principal"
+
+    # renpy/common/00preferences.rpy:531
+    old "mute main"
+    new "silenciar principal"
+
+# TODO: Translation updated at 2024-02-08 19:31
+
+translate es strings:
+
+    # renpy/common/00director.rpy:1745
+    old "Click to toggle attribute, right click to toggle negative attribute."
+    new "Click to toggle attribute, right click to toggle negative attribute."
+
+    # renpy/common/00director.rpy:1768
+    old "Click to set transform, right click to add to transform list."
+    new "Click to set transform, right click to add to transform list."
+
+    # renpy/common/00director.rpy:1789
+    old "Click to set, right click to add to behind list."
+    new "Click to set, right click to add to behind list."
+
+    # renpy/common/00gui.rpy:456
+    old "This save was created on a different device. Maliciously constructed save files can harm your computer. Do you trust this save's creator and everyone who could have changed the file?"
+    new "Este archivo se creó en otro dispositivo. Los archivos de guardado creados de forma maliciosa pueden dañar tu ordenador. ¿Confías en el creador de este archivo y en todos los que podrían haberlo modificado?"
+
+    # renpy/common/00gui.rpy:457
+    old "Do you trust the device the save was created on? You should only choose yes if you are the device's sole user."
+    new "¿Confías en el dispositivo en el que se creó el archivo guardado? Sólo debes elegir sí si eres el único usuario del dispositivo."
+
+    # renpy/common/00preferences.rpy:532
+    old "audio when unfocused"
+    new "audio cuando está desenfocado"
+
+    # renpy/common/00preferences.rpy:541
+    old "web cache preload"
+    new "precarga del caché web"
+
+    # renpy/common/00preferences.rpy:556
+    old "voice after game menu"
+    new "voz después del menú del juego"
+
+    # renpy/common/00speechbubble.rpy:344
+    old "Speech Bubble Editor"
+    new "Editor de Globos de diálogo"
+
+    # renpy/common/00speechbubble.rpy:349
+    old "(hide)"
+    new "(esconder)"
+
+    # renpy/common/00sync.rpy:70
+    old "Sync downloaded."
+    new "Sincronización descargada."
+
+    # renpy/common/00sync.rpy:190
+    old "Could not connect to the Ren'Py Sync server."
+    new "No se pudo conectar con el servidor de Ren'Py Sync."
+
+    # renpy/common/00sync.rpy:192
+    old "The Ren'Py Sync server timed out."
+    new "La conexión al servidor Ren'Py Sync expiró."
+
+    # renpy/common/00sync.rpy:194
+    old "An unknown error occurred while connecting to the Ren'Py Sync server."
+    new "Se ha producido un error desconocido al conectar con el servidor de Ren'Py Sync."
+
+    # renpy/common/00sync.rpy:267
+    old "The Ren'Py Sync server does not have a copy of this sync. The sync ID may be invalid, or it may have timed out."
+    new "El servidor de Ren'Py Sync no tiene una copia de esta sincronización. Puede que el ID de sincronización no sea válido o que se haya agotado el tiempo de espera."
+
+    # renpy/common/00sync.rpy:412
+    old "Please enter the sync ID you generated.\nNever enter a sync ID you didn't create yourself."
+    new "Introduce el ID de sincronización que has generado.\nNunca introduzcas un ID de sincronización que no hayas creado tú mismo."
+
+    # renpy/common/00sync.rpy:431
+    old "The sync ID is not in the correct format."
+    new "El ID de sincronización no tiene el formato correcto."
+
+    # renpy/common/00sync.rpy:451
+    old "The sync could not be decrypted."
+    new "No se ha podido desencriptar la sincronización."
+
+    # renpy/common/00sync.rpy:474
+    old "The sync belongs to a different game."
+    new "La sincronización le es de otro juego."
+
+    # renpy/common/00sync.rpy:479
+    old "The sync contains a file with an invalid name."
+    new "The sync contains a file with an invalid name."
+
+    # renpy/common/00sync.rpy:532
+    old "This will upload your saves to the {a=https://sync.renpy.org}Ren'Py Sync Server{/a}.\nDo you want to continue?"
+    new "This will upload your saves to the {a=https://sync.renpy.org}Ren'Py Sync Server{/a}.\nDo you want to continue?"
+
+    # renpy/common/00sync.rpy:561
+    old "Enter Sync ID"
+    new "Enter Sync ID"
+
+    # renpy/common/00sync.rpy:572
+    old "This will contact the {a=https://sync.renpy.org}Ren'Py Sync Server{/a}."
+    new "This will contact the {a=https://sync.renpy.org}Ren'Py Sync Server{/a}."
+
+    # renpy/common/00sync.rpy:599
+    old "Sync Success"
+    new "Sync Success"
+
+    # renpy/common/00sync.rpy:602
+    old "The Sync ID is:"
+    new "The Sync ID is:"
+
+    # renpy/common/00sync.rpy:608
+    old "You can use this ID to download your save on another device.\nThis sync will expire in an hour.\nRen'Py Sync is supported by {a=https://www.renpy.org/sponsors.html}Ren'Py's Sponsors{/a}."
+    new "You can use this ID to download your save on another device.\nThis sync will expire in an hour.\nRen'Py Sync is supported by {a=https://www.renpy.org/sponsors.html}Ren'Py's Sponsors{/a}."
+
+    # renpy/common/00sync.rpy:612
+    old "Continue"
+    new "Continuar"
+
+    # renpy/common/00sync.rpy:634
+    old "Sync Error"
+    new "Sync Error"
+
+# TODO: Translation updated at 2024-03-31 00:11
+
+translate es strings:
+
+    # renpy/common/00accessibility.rpy:120
+    old "Accessibility Menu. Use up and down arrows to navigate, and enter to activate buttons and bars."
+    new "Menú de accesibilidad. Utilice las flechas arriba y abajo para navegar, y enter para activar botones y barras."
+
+    # renpy/common/00director.rpy:1776
+    old "Customize director.transforms to add more transforms."
+    new "Edita director.transforms para añadir más transformaciones."
+
+    # renpy/common/00director.rpy:1821
+    old "Click to set."
+    new "Haz clic para fijar."
+
+    # renpy/common/00director.rpy:1822
+    old "Customize director.transitions to add more transitions."
+    new "edita director.transitions para añadir más transiciones."
+
+    # renpy/common/00director.rpy:1845
+    old "Customize director.audio_channels to add more channels."
+    new "Edita director.audio_channels para añadir más canales."
+
+    # renpy/common/00gui.rpy:454
+    old "Are you sure you want to continue where you left off?"
+    new "¿Seguro que quieres continuar donde lo dejaste?"
+
+    # renpy/common/00preferences.rpy:438
+    old "self voicing enable"
+    new "activar auto-voz"
+
+    # renpy/common/00preferences.rpy:440
+    old "self voicing disable"
+    new "desactivar auto-voz"
+
+    # renpy/common/00preferences.rpy:455
+    old "clipboard voicing enable"
+    new "activar voz de portapapeles"
+
+    # renpy/common/00preferences.rpy:457
+    old "clipboard voicing disable"
+    new "desactivar voz de portapapeles"
+
+    # renpy/common/00preferences.rpy:464
+    old "debug voicing enable"
+    new "activar voz debug"
+
+    # renpy/common/00preferences.rpy:466
+    old "debug voicing disable"
+    new "desactivar voz debug"
+
+    # renpy/common/00preferences.rpy:586
+    old "restore window position"
+    new "restaurar la posición de la ventana"
+
+    # renpy/common/00speechbubble.rpy:408
+    old "(clear retained bubbles)"
+    new "(borrar globos retenidos)"
+
+    # renpy/common/00updater.rpy:505
+    old "No update methods found."
+    new "No se encontraton métodos de actualización."
+
+    # renpy/common/00updater.rpy:552
+    old "Could not download file list: "
+    new "No se ha podido descargar la lista de archivos: "
+
+    # renpy/common/00updater.rpy:555
+    old "File list digest does not match."
+    new "El resumen de la lista de archivos no coincide."
+
+    # renpy/common/00updater.rpy:2072
+    old "Preparing to download the game data."
+    new "Preparando la descarga de los datos del juego."
+
+    # renpy/common/00updater.rpy:2074
+    old "Downloading the game data."
+    new "Descargando datos del juego."
+
+    # renpy/common/00updater.rpy:2076
+    old "The game data has been downloaded."
+    new "Los datos del juego han sido descargados."
+
+    # renpy/common/00updater.rpy:2078
+    old "An error occured when trying to download game data:"
+    new "Se ha producido un error al intentar descargar los datos del juego:"
+
+    # renpy/common/00updater.rpy:2083
+    old "This game cannot be run until the game data has been downloaded."
+    new "Este juego no puede ejecutarse hasta que se hayan descargado los datos del juego."
+
+    # renpy/common/00updater.rpy:2090
+    old "Retry"
+    new "Reintentar"
+
+# TODO: Translation updated at 2024-10-12 21:43
+
+translate es strings:
+
+    # renpy/common/00accessibility.rpy:198
+    old "Self-voicing support is limited when using a touch screen."
+    new "La auto-voz es limitada en dispositivos táctiles."
+
+    # renpy/common/00preferences.rpy:597
+    old "reset"
+    new "reiniciar"
+
+    # renpy/common/00translation.rpy:63
+    old "Translation identifier: [identifier]"
+    new "Identificar de traducción: [identifier]"
+
+    # renpy/common/00translation.rpy:84
+    old " translates [tl.filename]:[tl.linenumber]"
+    new " traduce [tl.filename]:[tl.linenumber]"
+
+    # renpy/common/00translation.rpy:101
+    old "\n{color=#fff}Copied to clipboard.{/color}"
+    new "\n{color=#fff}Copiado al portapapeles.{/color}"
+

game/tl/es/src/credits.rpy

@@ -142,3 +142,11 @@ translate es strings:
     old "Asset help (Italian):"
     new "Ayuda extra (Italiano):"
 
+# TODO: Translation updated at 2024-10-12 21:43
+
+translate es strings:
+
+    # game/src/credits.rpy:80
+    old "Promo Art (Italian):"
+    new "Arte promocional (Italiano)"
+

renconstruct.toml

@@ -22,5 +22,5 @@
   clear_output_dir = false # whether to clear the output directory on startup
 
 [renutil]
-  version = "8.3.0" # the Ren'Py version to use (required)
+  version = "8.3.2" # the Ren'Py version to use (required)
   registry = "/tmp/cache" # the directory to store installation files in