Implement internal 'en' language, and backport splashscreen fixes from Wani

game/script.rpy

@@ -54,6 +54,20 @@ init python:
     if renpy.seen_image("fang tail"):
         renpy.mark_image_seen("fang_tail_movie")
 
+    # Determine the splash type for the Snoot game logo
+    $ persistent.splashtype = random.randint(0,2000 - 1)
+
+
+label before_main_menu:
+    # Force users pre-Patch 11 to use english if they were on 'None'
+    if preferences.language == None:
+        $ preferences.language = 'en'
+
+    # Call initial language setup screen
+    if (persistent.languaged_up is None):
+        $ preferences.set_volume('ui', config.default_sfx_volume)
+        $ persistent.languaged_up = True
+        call screen lang_sel
 
 label start:
 

game/src/image_definitions.rpy

@@ -352,6 +352,18 @@ init 1 python:
 
 # aight, time for the stuff that isn't gallery required.
 
+### SPLASHSCREEN
+
+image caveintrosequence:
+    "caveintro"
+    alpha 0
+    time 0.5
+    linear 3.5 alpha 1
+    time 10
+    linear 1 alpha 0
+
+
+
 ### OTHER
 
 

game/src/splashscreen.rpy

@@ -1,25 +1,11 @@
 
 label splashscreen:
-    $ persistent.splashtype = random.randint(0,2000 - 1)
-
-    image caveintrosequence:
-        "caveintro"
-        alpha 0
-        time 0.5
-        linear 3.5 alpha 1
-        time 10
-        linear 1 alpha 0
-
+    if not renpy.get_autoreload():
         show caveintrosequence
         play sound 'audio/OST/startup.ogg'
         pause 11.2
         stop sound
 
-    if (persistent.languaged_up is None):
-        $ persistent.languaged_up = True
-        $ preferences.set_volume('ui', config.default_sfx_volume) # hack
-        call screen lang_sel
-
 
     return
 

game/src/translation.rpy

@@ -36,7 +36,7 @@ init python:
     notice = _("NOTICE: Please keep in mind this is a fan translation, and as such it may not be completely accurate to the original intent of any written lines.")
 
     languages = [
-        {'image': 'gui/flag/USofA.png', 'name': 'English', 'value': None },
+        {'image': 'gui/flag/USofA.png', 'name': 'English', 'value': 'en' },
         {'image': 'gui/flag/Mexico.png', 'name': 'Español', 'value': 'es'},
         {'image': 'gui/flag/Rus.png', 'name': 'Русский', 'value': 'ru'},
         {'image': 'gui/flag/Poland.png', 'name': 'Polski', 'value': 'pl'},
@@ -106,7 +106,7 @@ screen lang_sel():
                                 imagebutton:
                                     idle darkie(languages[i]["image"])
                                     hover glowie(languages[i]["image"])
-                                    action If(languages[i]["value"] in persistent.seenWarning or languages[i]["value"] == None,
+                                    action If(languages[i]["value"] in persistent.seenWarning or languages[i]["value"] == 'en'',
                                         true = [Language(languages[i]["value"]), MainMenu(False,False)],
                                         # Important to change the language before calling notice. Otherwise it will be in english.
                                         false = [Language(languages[i]["value"]), AddToSet(set=persistent.seenWarning, value=languages[i]["value"]), Show(screen="OkPrompt", message=notice, go_menu=True)]
@@ -122,7 +122,7 @@ screen lang_button(lang):
         spacing 15
         textbutton lang["name"]:
             activate_sound "audio/ui/uiRollover.wav"
-            action If(lang["value"] in persistent.seenWarning or lang["value"] == None,
+            action If(lang["value"] in persistent.seenWarning or lang["value"] == 'en',
             true = [Language(lang["value"])],
             false = [Language(lang["value"]), AddToSet(set=persistent.seenWarning, value=lang["value"]), Show(screen="OkPrompt", message=notice, go_menu=False)]
             )