Wrap json loaded in revertible objects.

This is intended to improve compatibility with older games that might use .iteritems and similar methods.
fonts: Allow deallocation and clear face cache.
2025-02-12 23:21:48 -05:00 · 2025-02-12 22:51:50 -05:00 · 2025-02-07 01:24:18 -05:00 · 2025-01-31 22:07:18 -05:00 · 2025-01-24 21:29:51 -05:00 · 2025-01-23 22:32:49 -05:00
357 changed files with 2022 additions and 1251 deletions
@@ -252,7 +252,7 @@ def main():
            "-q",
            "egg_info",
            "--tag-build",
-            "+renpy" + args.version,
+            "+renpy" + args.version.replace("+", "-"),
            "sdist",
            "-d",
            os.path.abspath(destination)
@@ -328,7 +328,7 @@ define gui.vbar_borders = Borders(gui.scale(4), gui.scale(4), gui.scale(4), gui.
 define gui.vscrollbar_borders = Borders(gui.scale(4), gui.scale(4), gui.scale(4), gui.scale(4))
 define gui.vslider_borders = Borders(gui.scale(4), gui.scale(4), gui.scale(4), gui.scale(4))

-## What to do with unscrollable scrollbars in the gui. "hide" hides them, while
+## What to do with unscrollable scrollbars in the game menu. "hide" hides them, while
 ## None shows them.
 define gui.unscrollable = "hide"

@@ -96,7 +96,6 @@ style frame:
 ## https://www.renpy.org/doc/html/screen_special.html#say

 screen say(who, what):
-    style_prefix "say"

    window:
        id "window"
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1100,12 +1100,14 @@ fix_dlc("renios", "renios")

            prefix = py("lib/py{major}-")

-            if os.path.exists(linux_i686):
+            i686fn = os.path.join(config.renpy_base, prefix + "linux-i686/renpy")
+
+            if os.path.exists(i686fn):

                self.add_file(
                    linux_i686,
                    prefix + "linux-i686/" + self.executable_name,
-                    os.path.join(config.renpy_base, prefix + "linux-i686/renpy"),
+                    i686fn,
                    True)

            self.add_file(
@@ -1531,7 +1533,8 @@ fix_dlc("renios", "renios")

            update = { variant : { "version" : self.update_versions[variant], "base_name" : self.base_name, "files" : update_files, "directories" : update_directories, "xbit" : update_xbit } }

-            update_fn = os.path.join(self.destination, filename + ".update.json")
+            update_fn = self.temp_filename(filename + ".update.json")
+

            if self.include_update and not format.startswith("app-"):

@@ -1565,9 +1568,11 @@ fix_dlc("renios", "renios")
                in this thread or a background thread.
                """

-                if self.include_update and not self.build_update and not dlc:
+                final_update_fn = os.path.join(self.destination, filename + ".update.json")
+
+                if self.build_update or dlc:
                    if os.path.exists(update_fn):
-                        os.unlink(update_fn)
+                        shutil.copy(update_fn, final_update_fn)

                if not directory:
                    file_hash = hash_file(path)
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -172,7 +172,7 @@ class CodeGenerator(object):

        for l in self.lines:

-            m = re.match('^(\s*)define (.*?) =', l)
+            m = re.match(r'^(\s*)define (.*?) =', l)

            if m:
                indent = m.group(1)
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -169,7 +169,7 @@ def _check_hash(filename, hashj):
 download_file = ""
 download_url = ""

-def download(url, filename, hash=None):
+def download(url, filename, hash=None, headers=None, requests_kwargs={}):
    """
    Downloads `url` to `filename`, a tempfile.
    """
@@ -188,9 +188,13 @@ def download(url, filename, hash=None):

    progress_time = time.time()

+    all_headers = {"User-Agent": 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.0.0 Safari/537.36 renpy/8'}
+    if headers:
+        all_headers.update(headers)
+
    try:

-        response = requests.get(url, stream=True, proxies=renpy.exports.proxies, timeout=15)
+        response = requests.get(url, stream=True, proxies=renpy.exports.proxies, timeout=15, headers=all_headers, **requests_kwargs)
        response.raise_for_status()

        total_size = int(response.headers.get('content-length', 1))
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -33,6 +33,10 @@ init python in interface:
    DOC_URL = "http://www.renpy.org/doc/html/"
    DOC_LOCAL_URL = "file:///" + DOC_PATH

+    # If true, the launcher should not link back to renpy.org.
+    NO_LAUNCHER_LINKS = os.path.exists(os.path.join(config.renpy_base, "no_launcher_links.txt"))
+
+
    local_doc_exists = os.path.exists(DOC_PATH)

    def get_doc_url(page):
@@ -40,7 +44,7 @@ init python in interface:
        Returns the URL to the documentation page.
        """

-        if local_doc_exists and not persistent.use_web_doc:
+        if local_doc_exists and (NO_LAUNCHER_LINKS or not persistent.use_web_doc):
            from urllib.parse import urljoin
            from urllib.request import pathname2url

@@ -117,7 +121,10 @@ screen bottom_info:
                hbox:
                    spacing INDENT
                    textbutton _("Documentation") style "l_link" action interface.OpenDocumentation()
-                    textbutton _("Ren'Py Website") style "l_link" action OpenURL(interface.RENPY_URL)
+
+                    if not interface.NO_LAUNCHER_LINKS:
+                        textbutton _("Ren'Py Website") style "l_link" action OpenURL(interface.RENPY_URL)
+
                    textbutton _("[interface.version]") style "l_link" action Jump("about")

                hbox:
@@ -133,7 +140,7 @@ screen bottom_info:
                    textbutton _("preferences") style "l_link" action Jump("preferences")
                    textbutton _("quit") style "l_link" action Quit(confirm=False)

-            if persistent.sponsor_message:
+            if persistent.sponsor_message and not interface.NO_LAUNCHER_LINKS:

                textbutton _("Ren'Py Sponsor Information"):
                    style "l_link"
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -50,7 +50,7 @@ init python:
            pass

        with interface.error_handling(_("Downloading the itch.io butler.")):
-            url = "https://broth.itch.ovh/butler/{}/LATEST/archive/default".format(platform)
+            url = "https://broth.itch.zone/butler/{}/LATEST/archive/default".format(platform)

            response = requests.get(url, headers={'User-Agent' : "Renpy"}, proxies=renpy.proxies)

@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -301,6 +301,8 @@ init python:
    build.classify_renpy("**.new", None)
    build.classify_renpy("**.bak", None)

+    build.classify_renpy("**.keystore", None)
+
    build.classify_renpy("**/log.txt", None)
    build.classify_renpy("**/traceback.txt", None)
    build.classify_renpy("**/errors.txt", None)
@@ -408,9 +410,15 @@ init python:
    build.classify_renpy("module/libhydrogen/**", "source")

    # all-platforms binary.
+    build.classify_renpy("lib/**/libpython{}.{}.dll".format(sys.version_info.major, sys.version_info.minor), "binary")
+    build.classify_renpy("lib/**/libpython*.dll", None)
+
    build.classify_renpy("lib/**/*steam_api*", "steam")
    build.classify_renpy("lib/**/*Live2D*", None)

+
+    libpython = "lib/python{}.{}".format(sys.version_info.major, sys.version_info.minor)
+
    if PY2:
        build.classify_renpy("lib/py2-linux-armv7l/**", "linux_arm")
        build.classify_renpy("lib/py2-linux-aarch64/**", "linux_arm")
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-
+
 translate german strings:

    # screens.rpy:9
@@ -53,7 +53,7 @@

    # game/editor.rpy:327
    old "An exception occured while launching the text editor:\n[exception!q]"
-    new "Ocorreu uma exceção ao executar o editor de texto:\[exception!q]"
+    new "Ocorreu uma exceção ao executar o editor de texto:\n[exception!q]"

    # game/editor.rpy:423
    old "Select Editor"
@@ -1874,7 +1874,7 @@

    # game/androidstrings.rpy:43
    old "I was unable to use javac to compile a test file. If you haven't installed the Java Development Kit yet, please download it from:\n\n{a=https://adoptium.net/?variant=openjdk8}https://adoptium.net/?variant=openjdk8{/a}\n\nThe JDK is different from the JRE, so it's possible you have Java without having the JDK. Please make sure you installed the 'JavaSoft (Oracle) registry keys'.\n\nWithout a working JDK, I can't continue."
-    new "Не удалось использовать javac для компиляции тестового файла. Если вы еще не установили Java Development Kit, загрузите его с:\n\n{a=https://adoptium.net/?variant=openjdk8}https://adoptium.net/?variant=openjdk8{/a}\n\JDK отличается от JRE, поэтому возможно, что у вас есть Java без JDK. Пожалуйста, убедитесь, что вы установили 'переменные окружения JavaSoft (Oracle)'.\n\nБез работающего JDK я не могу продолжать."
+    new "Не удалось использовать javac для компиляции тестового файла. Если вы еще не установили Java Development Kit, загрузите его с:\n\n{a=https://adoptium.net/?variant=openjdk8}https://adoptium.net/?variant=openjdk8{/a}\n\nJDK отличается от JRE, поэтому возможно, что у вас есть Java без JDK. Пожалуйста, убедитесь, что вы установили 'переменные окружения JavaSoft (Oracle)'.\n\nБез работающего JDK я не могу продолжать."

    # game/androidstrings.rpy:64
    old "I've opened the directory containing android.keystore and bundle.keystore. Please back them up, and keep them in a safe place."
@@ -884,7 +884,7 @@ translate spanish strings:

    # renpy/common/00sync.rpy:593
    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 "Puede usar esta ID para descargar su guardado en otro dispositivo.\nEsta sincronización caducará en una hora.\RenPy Sync está para {a=https://www.renpy.org/sponsors.html}los patrocinadores de Ren'Py{/a}."
+    new "Puede usar esta ID para descargar su guardado en otro dispositivo.\nEsta sincronización caducará en una hora.\nRenPy Sync está para {a=https://www.renpy.org/sponsors.html}los patrocinadores de Ren'Py{/a}."

    # renpy/common/00sync.rpy:619
    old "Sync Error"
@@ -1,4 +1,4 @@
-
+
 translate ukrainian strings:

    # 00action_file.rpy:26
@@ -1,4 +1,4 @@
-
+
 translate ukrainian strings:

    # 00console.rpy:255
@@ -1,4 +1,4 @@
-
+
 translate ukrainian strings:

    # 00gltest.rpy:70
@@ -1,4 +1,4 @@
-
+
 translate ukrainian strings:

    # gui/game/gui.rpy:2
@@ -1,4 +1,4 @@
-
+
 translate ukrainian strings:

    # game/about.rpy:39
@@ -1,4 +1,4 @@
-
+
 translate ukrainian strings:

    # gui/game/options.rpy:1
@@ -1,4 +1,4 @@
-
+
 translate ukrainian strings:

    # gui/game/screens.rpy:9
@@ -1,4 +1,4 @@
-# У цьому файлі міститься сценарій гри.
+# У цьому файлі міститься сценарій гри.

 # Визначення персонажів для гри.
 # Аргумент color змінює колір ім’я персонажа.
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -17,6 +17,8 @@ root = ""

 import renpy

+class BannedException(Exception):
+    pass

 class WebHandler(http.server.BaseHTTPRequestHandler):

@@ -59,7 +61,13 @@ class WebHandler(http.server.BaseHTTPRequestHandler):
        None, in which case the caller has nothing further to do.

        """
-        path = self.translate_path(self.path)
+
+        try:
+            path = self.translate_path(self.path)
+        except BannedException:
+            self.send_error(403, "File not found")
+            return None
+
        f = None
        if os.path.isdir(path):
            parts = urllib.parse.urlsplit(self.path)
@@ -192,6 +200,9 @@ class WebHandler(http.server.BaseHTTPRequestHandler):
        path = root

        for word in words:
+            if word.startswith("."):
+                raise BannedException("Invalid path.")
+
            if os.path.dirname(word) or word in (os.curdir, os.pardir):
                # Ignore components that are not a simple file/directory name
                continue
@@ -1,5 +1,5 @@
 # -*- python -*-
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>

 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -8,25 +8,12 @@ cdef extern from "stdlib.h":
 cdef extern from "pyfreetype.h":
    #ftconfig.h
    #Some tweaking may be needed on a platform-by-platform basis
-    DEF FT_SIZEOF_INT = 4
-    DEF FT_SIZEOF_LONG = 4
-
    ctypedef signed short      FT_Int16
    ctypedef unsigned short    FT_UInt16
-    IF FT_SIZEOF_INT == 4:
-        ctypedef signed int    FT_Int32
-        ctypedef unsigned int  FT_UInt32
-    ELIF FT_SIZEOF_LONG == 4:
-        ctypedef signed long   FT_Int32
-        ctypedef unsigned long FT_UInt32
-
-    IF FT_SIZEOF_INT >= 4:
-        ctypedef int           FT_Fast
-        ctypedef unsigned int  FT_UFast
-    ELIF FT_SIZEOF_LONG >= 4:
-        ctypedef long          FT_Fast
-        ctypedef unsigned long FT_UFast
-
+    ctypedef signed int    FT_Int32
+    ctypedef unsigned int  FT_UInt32
+    ctypedef int           FT_Fast
+    ctypedef unsigned int  FT_UFast

    # Moved up.
    cdef struct FT_ModuleRec_
@@ -1202,7 +1202,7 @@ void RPS_set_secondary_volume(int channel, float vol2, float delay) {
 /**
 * Replaces audio filters with the given PyObject.
 */
-void RPS_replace_audio_filter(int channel, PyObject *new_filter) {
+void RPS_replace_audio_filter(int channel, PyObject *new_filter, int primary) {

    struct Channel *c;

@@ -1214,10 +1214,13 @@ void RPS_replace_audio_filter(int channel, PyObject *new_filter) {

    LOCK_AUDIO();

-    if (c->playing_audio_filter) {
-        Py_DECREF(c->playing_audio_filter);
-        Py_INCREF(new_filter);
-        c->playing_audio_filter = new_filter;
+    if (primary) {
+
+        if (c->playing_audio_filter) {
+            Py_DECREF(c->playing_audio_filter);
+            Py_INCREF(new_filter);
+            c->playing_audio_filter = new_filter;
+        }
    }

    if (c->queued_audio_filter) {
@@ -43,7 +43,7 @@ void RPS_set_volume(int channel, float volume);
 float RPS_get_volume(int channel);
 void RPS_set_pan(int channel, float pan, float delay);
 void RPS_set_secondary_volume(int channel, float vol2, float delay);
-void RPS_replace_audio_filter(int channel, PyObject *audio_filter);
+void RPS_replace_audio_filter(int channel, PyObject *audio_filter, int primary);

 int RPS_video_ready(int channel);
 PyObject *RPS_read_video(int channel);
@@ -1,6 +1,6 @@
 #!/usr/bin/env python

-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -3,7 +3,7 @@
 # This file is part of Ren'Py. The license below applies to Ren'Py only.
 # Games and other projects that use Ren'Py may use a different license.

-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -43,11 +43,17 @@ from renpy.parameter import Parameter, Signature, ParameterInfo, ArgumentInfo, \
    apply_arguments, EMPTY_PARAMETERS, EMPTY_ARGUMENTS


+# The name of the current statement.
+current_statement_name = "init"
+
 def statement_name(name):
    """
    Reports the name of this statement to systems like window auto.
    """

+    global current_statement_name
+    current_statement_name = name
+
    for i in renpy.config.statement_callbacks:
        i(name)

@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1146,6 +1146,16 @@ compatible_pairs = [
 # values of the variables here.


+def check_spline_types(value):
+    if isinstance(value, (position, int, float)):
+        return True
+
+    if isinstance(value, tuple):
+        return all(check_spline_types(i) for i in value)
+
+    return False
+
+
 class RawMultipurpose(RawStatement):

    warp_function = None
@@ -1208,15 +1218,6 @@ class RawMultipurpose(RawStatement):

        compiling(self.loc)

-        def check_spline_types(value):
-            if isinstance(value, (position, int, float)):
-                return True
-
-            if isinstance(value, tuple):
-                return all(check_spline_types(i) for i in value)
-
-            return False
-
        # Figure out what kind of statement we have. If there's no
        # interpolator, and no properties, than we have either a
        # call, or a child statement.
@@ -1333,7 +1334,7 @@ class RawMultipurpose(RawStatement):
            except Exception:
                continue

-            if isinstance(i, ATLTransformBase):
+            if isinstance(i, ATLTransformBase) and (i.child is None):
                i.atl.predict(ctx)
                return

@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -230,6 +230,7 @@ class Channel(object):

    # The audio filter to use.
    audio_filter = None
+    raw_audio_filter = None

    def __init__(self, name, default_loop, stop_on_mute, tight, file_prefix, file_suffix, buffer_queue, movie, framedrop, synchro_start):

@@ -364,9 +365,12 @@ class Channel(object):
        ExecutionContext to point to the copy, and returns the copy.
        """

-        mcd = renpy.game.context().music
+        context = renpy.game.context()
+        mcd = dict(context.music)
+        context.music = mcd

        ctx = self.get_context().copy()
+
        mcd[self.name] = ctx
        return ctx

@@ -454,7 +458,11 @@ class Channel(object):

        # Update the channel volume.

-        mixer_volume = renpy.game.preferences.volumes.get(self.mixer, 1.0)
+        if self.mixer:
+            mixer_volume = renpy.game.preferences.volumes.get(self.mixer, 1.0)
+        else:
+            mixer_volume = 1.0
+
        main_volume = renpy.game.preferences.volumes.get("main", 1.0)

        if renpy.game.preferences.self_voicing:
@@ -690,6 +698,7 @@ class Channel(object):

            old_raw_audio_filter = self.context.raw_audio_filter
            self.context.raw_audio_filter = audio_filter
+            self.raw_audio_filter = audio_filter

            if old_raw_audio_filter is None and audio_filter is None:
                new_audio_filter = None
@@ -701,11 +710,14 @@ class Channel(object):

            self.context.audio_filter = new_audio_filter

-            if replace:
-                for q in self.queue:
-                    q.audio_filter = new_audio_filter
+            for q in self.queue:
+                q.audio_filter = new_audio_filter
+
+            if replace:
+                renpysound.replace_audio_filter(self.number, new_audio_filter, 1)
+            else:
+                renpysound.replace_audio_filter(self.number, new_audio_filter, 0)

-                renpysound.replace_audio_filter(self.number, new_audio_filter)

    def enqueue(self, filenames, loop=True, synchro_start=None, fadein=0, tight=None, loop_only=False, relative_volume=1.0):

@@ -905,17 +917,20 @@ def register_channel(name,
        Ren'Py will display frames late rather than dropping them.

    `synchro_start`
-        Does this channel particpate in synchro start? Synchro start determines if
+        Does this channel participate in synchro start? Synchro start determines if
        the channel will start playing at the same time as other channels. If None,
-        this defaults to `loop`.
+        this defaults to `loop` if `movie` is False, and False otherwise.
    """

-    if synchro_start is None:
-        synchro_start = loop
-
    if name == "movie":
        movie = True

+    if synchro_start is None:
+        if movie:
+            synchro_start = False
+        else:
+            synchro_start = loop
+
    if not force and not renpy.game.context().init_phase and (" " not in name):
        raise Exception("Can't register channel outside of init phase.")

@@ -1255,9 +1270,6 @@ def interact():

                c.interact()

-                # if _music_volumes.get(i, 1.0) != c.chan_volume:
-                #    c.set_volume(_music_volumes.get(i, 1.0))
-
                ctx = c.context

                # If we're in the same music change, then do nothing with the
@@ -1268,11 +1280,14 @@ def interact():
                filenames = ctx.last_filenames
                tight = ctx.last_tight

+                if ctx.raw_audio_filter != c.raw_audio_filter:
+                    c.set_audio_filter(ctx.raw_audio_filter, True)
+
                if c.loop != filenames:
                    c.fadeout(max(renpy.config.context_fadeout_music, renpy.config.fadeout_audio))

                if filenames:
-                    c.enqueue(filenames, loop=True, synchro_start=True, tight=tight, fadein=renpy.config.context_fadein_music, relative_volume=ctx.last_relative_volume)
+                    c.enqueue(filenames, loop=True, synchro_start=c.default_synchro_start, tight=tight, fadein=renpy.config.context_fadein_music, relative_volume=ctx.last_relative_volume)

                c.last_changed = ctx.last_changed

@@ -20,6 +20,6 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-ctypedef void (*apply_audio_filter_type)(object, float *, int, int, int)
+ctypedef void (*apply_audio_filter_type)(object, float *, int, int, int) noexcept

 cdef apply_audio_filter_type *get_apply_audio_filter()
@@ -1,5 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
-#
+1#
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
 # (the "Software"), to deal in the Software without restriction,
@@ -60,7 +59,7 @@ cdef struct SampleBuffer:
 # A linked list of sample buffers with 0-16 subchannels.
 cdef SampleBuffer *free_buffers[SUBCHANNELS+1]

-cdef SampleBuffer *allocate_buffer(int subchannels, int length) nogil:
+cdef SampleBuffer *allocate_buffer(int subchannels, int length) noexcept nogil:
    """
    Allocates a sample buffer.
    """
@@ -91,7 +90,7 @@ cdef SampleBuffer *allocate_buffer(int subchannels, int length) nogil:
    return buf


-cdef void free_buffer(SampleBuffer *buf) nogil:
+cdef void free_buffer(SampleBuffer *buf) noexcept nogil:
    """
    Frees a sample buffer, by putting it back on the free list.
    """
@@ -123,7 +122,7 @@ cdef class AudioFilter:

        raise NotImplementedError("prepare")

-    cdef SampleBuffer *apply(self, SampleBuffer *samples) nogil:
+    cdef SampleBuffer *apply(self, SampleBuffer *samples) noexcept nogil:
        """
        Applies the filter to the given samples.
        """
@@ -157,7 +156,7 @@ cdef class Null(AudioFilter):
    def prepare(self, int samplerate):
        pass

-    cdef SampleBuffer *apply(self, SampleBuffer *samples) nogil:
+    cdef SampleBuffer *apply(self, SampleBuffer *samples) noexcept nogil:
        cdef SampleBuffer *result = allocate_buffer(samples.subchannels, samples.length)
        memcpy(result.samples, samples.samples, samples.length * samples.subchannels * sizeof(float))
        return result
@@ -188,7 +187,7 @@ cdef class FilterList:
    def __dealloc__(self):
        free(self.filters)

-    cdef SampleBuffer *apply(self, int index, SampleBuffer *samples) nogil:
+    cdef SampleBuffer *apply(self, int index, SampleBuffer *samples) noexcept nogil:
        return (<AudioFilter> self.filters[index]).apply(samples)

    def __iter__(self):
@@ -223,7 +222,7 @@ cdef class Sequence(AudioFilter):
        for f in self.filters:
            f.prepare(samplerate)

-    cdef SampleBuffer *apply(self, SampleBuffer *samples) nogil:
+    cdef SampleBuffer *apply(self, SampleBuffer *samples) noexcept nogil:

        cdef SampleBuffer *result
        cdef SampleBuffer *old_result = samples
@@ -408,7 +407,7 @@ cdef class Biquad(AudioFilter):
        self.cy2 = a2 / a0


-    cdef SampleBuffer *apply(self, SampleBuffer *samples) nogil:
+    cdef SampleBuffer *apply(self, SampleBuffer *samples) noexcept nogil:

        cdef SampleBuffer *result = allocate_buffer(samples.subchannels, samples.length)
        cdef int i, j
@@ -634,7 +633,7 @@ cdef class Crossfade(AudioFilter):

        self.duration_samples = int(self.duration * samplerate)

-    cdef SampleBuffer *apply(self, SampleBuffer *samples) nogil:
+    cdef SampleBuffer *apply(self, SampleBuffer *samples) noexcept nogil:

        cdef SampleBuffer *result1
        cdef SampleBuffer *result2
@@ -705,7 +704,7 @@ cdef class Mix(AudioFilter):
        for f in self.filters:
            f.prepare(samplerate)

-    cdef SampleBuffer *apply(self, SampleBuffer *samples) nogil:
+    cdef SampleBuffer *apply(self, SampleBuffer *samples) noexcept nogil:

            cdef SampleBuffer *result = NULL
            cdef SampleBuffer *temp
@@ -744,7 +743,7 @@ cdef class Multiply(AudioFilter):
    def prepare(self, int samplerate):
        return

-    cdef SampleBuffer *apply(self, SampleBuffer *samples) nogil:
+    cdef SampleBuffer *apply(self, SampleBuffer *samples) noexcept nogil:

            cdef SampleBuffer *result
            cdef int i, j
@@ -807,7 +806,7 @@ cdef class DelayBuffer:
    def __dealloc__(self):
        free(self.buffer)

-    cdef void queue(self, SampleBuffer *samples) nogil:
+    cdef void queue(self, SampleBuffer *samples) noexcept nogil:

        cdef int i, j

@@ -816,7 +815,7 @@ cdef class DelayBuffer:
                self.buffer[self.write_index[j]] = samples.samples[i * samples.subchannels + j]
                self.write_index[j] = (self.write_index[j] + 1) % self.length

-    cdef SampleBuffer * dequeue(self, int subchannels, int length) nogil:
+    cdef SampleBuffer * dequeue(self, int subchannels, int length) noexcept nogil:

        cdef SampleBuffer *result = allocate_buffer(subchannels, length)
        cdef int i, j
@@ -865,7 +864,7 @@ cdef class Delay(AudioFilter):
        if self.buffer is None and self.max_delay >= 0.01:
            self.buffer = DelayBuffer(self.delay, samplerate, SUBCHANNELS)

-    cdef SampleBuffer *apply(self, SampleBuffer *samples) nogil:
+    cdef SampleBuffer *apply(self, SampleBuffer *samples) noexcept nogil:
        cdef SampleBuffer *result

        if self.max_delay < 0.01:
@@ -936,7 +935,7 @@ cdef class Comb(AudioFilter):

        self.filter.prepare(samplerate)

-    cdef SampleBuffer *apply(self, SampleBuffer *samples) nogil:
+    cdef SampleBuffer *apply(self, SampleBuffer *samples) noexcept nogil:

        cdef SampleBuffer *delayed
        cdef SampleBuffer *result
@@ -1001,7 +1000,7 @@ cdef class WetDry(AudioFilter):
    def prepare(self, int samplerate):
        self.filter.prepare(samplerate)

-    cdef SampleBuffer *apply(self, SampleBuffer *samples) nogil:
+    cdef SampleBuffer *apply(self, SampleBuffer *samples) noexcept nogil:

        cdef SampleBuffer *result
        cdef SampleBuffer *filtered
@@ -1107,7 +1106,7 @@ def to_audio_filter(o):
    raise TypeError("Expected an AudioFilter, got {!r}.".format(o))


-cdef void apply_audio_filter(AudioFilter af, float *samples, int subchannels, int length, int samplerate) nogil:
+cdef void apply_audio_filter(AudioFilter af, float *samples, int subchannels, int length, int samplerate) noexcept nogil:
    """
    :undocumented:
    """
@@ -1140,5 +1139,5 @@ cdef void apply_audio_filter(AudioFilter af, float *samples, int subchannels, in
    return


-cdef apply_audio_filter_type *get_apply_audio_filter():
+cdef apply_audio_filter_type *get_apply_audio_filter() noexcept:
    return <apply_audio_filter_type *> apply_audio_filter
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -662,11 +662,19 @@ def set_audio_filter(channel, audio_filter, replace=False, duration=0.016):
        The duration to change from the current to the new filter, in seconds.
        This prevents a popping sound when changing filters.
    """
+
+    replace = replace or renpy.game.after_rollback
+
    if audio_filter is not None:
        audio_filter = renpy.audio.filter.to_audio_filter(audio_filter)

    try:
        c = renpy.audio.audio.get_channel(channel)
+        ctx = c.copy_context()
+
+        t = get_serial()
+        ctx.last_changed = t
+
        c.set_audio_filter(audio_filter, replace=replace, duration=duration)
    except Exception:
        if renpy.config.debug_sound:
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -74,7 +74,7 @@ cdef extern from "renpysound_core.h":
    float RPS_get_volume(int channel)
    void RPS_set_pan(int channel, float pan, float delay)
    void RPS_set_secondary_volume(int channel, float vol2, float delay)
-    void RPS_replace_audio_filter(int channel, object audio_filter)
+    void RPS_replace_audio_filter(int channel, object audio_filter, int primary)

    void RPS_advance_time()
    int RPS_video_ready(int channel)
@@ -95,7 +95,7 @@ cdef extern from "renpysound_core.h":


 from renpy.audio.filter cimport get_apply_audio_filter
-RPS_apply_audio_filter = <void (*)(object, float *, int, int, int)> get_apply_audio_filter()
+RPS_apply_audio_filter = <void (*)(object, float *, int, int, int) noexcept> get_apply_audio_filter()


 def check_error():
@@ -343,15 +343,19 @@ def set_secondary_volume(channel, volume, delay):
    check_error()


-def replace_audio_filter(channel, audio_filter):
+def replace_audio_filter(channel, audio_filter, playing):
    """
    Replaces the audio filter for `channel` with `audio_filter`.
+
+    `playing`
+        If true, the filter is applied to the currently playing file and queued file. If false,
+        the filter is only applied to the queued file.
    """

    if audio_filter is not None:
        audio_filter.prepare(get_sample_rate())

-    RPS_replace_audio_filter(channel, audio_filter)
+    RPS_replace_audio_filter(channel, audio_filter, playing)


 def deallocate_audio_filter(audio_filter):
@@ -514,7 +518,7 @@ def set_generate_audio_c_function(fn):
        import ctypes
        fn = ctypes.cast(fn, ctypes.c_void_p).value

-    RPS_generate_audio_c_function = <void (*)(float *, int)> <uintptr_t> fn
+    RPS_generate_audio_c_function = <void (*)(float *, int) noexcept> <uintptr_t> fn


 # Store the sample surfaces so they stay alive.
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -352,14 +352,14 @@ def set_secondary_volume(channel, volume, delay):


@proxy_with_channel
-def replace_audio_filter(channel, audio_filter):
+def replace_audio_filter(channel, audio_filter, primary):
    """
    Replaces the audio filter for `channel` with `audio_filter`.
    """

    afid = load_audio_filter(audio_filter)

-    call("replace_audio_filter", channel, afid)
+    call("replace_audio_filter", channel, afid, primary)


 def audio_filter_constructor(f):
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -714,7 +714,10 @@ def display_say(
                    if scry.extend_text is renpy.ast.DoesNotExtend:
                        break
                    elif scry.extend_text is not None:
-                        extend_text += scry.extend_text
+                        try:
+                            extend_text += renpy.substitutions.substitute(scry.extend_text, scope=None, force=False, translate=True)[0]
+                        except Exception:
+                            pass

                    scry = scry.next()
                    scry_count += 1
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -69,6 +69,37 @@ init -1500 python:
        else:
            return false

+
+    class _ActionList(Action, DictEquality):
+        """
+        :undocumented:
+
+        Encapsulates a list of actions, so that they can be treated as a single action,
+        for the purposes of SelectedIf and SensitiveIf.
+        """
+
+        def __init__(self, actions):
+            self.actions = actions
+
+        def get_selected(self):
+            return renpy.display.behavior.is_selected(self.actions)
+
+        def get_sensitive(self):
+            return renpy.display.behavior.is_sensitive(self.actions)
+
+        def get_tooltip(self):
+            return renpy.display.behavior.get_tooltip(self.actions)
+
+        def periodic(self, st):
+            return renpy.display.behavior.run_periodic(self.actions, st)
+
+        def unhovered(self):
+            return renpy.display.behavior.run_unhovered(self.actions)
+
+        def __call__(self):
+            return renpy.run(self.actions)
+
+
    @renpy.pure
    class SelectedIf(Action, DictEquality):
        """
@@ -89,10 +120,13 @@ init -1500 python:
        # Note: This had been documented to take a boolean.

        def __init__(self, expression):
+            if isinstance(expression, (list, tuple)):
+                expression = _ActionList(expression)
+
            self.expression = expression

            if isinstance(expression, Action):
-                for i in ("get_selected", "get_sensitive", "get_tooltip", "periodic", "unhovered"):
+                for i in ("get_selected", "get_sensitive", "get_tooltip", "periodic", "unhovered", "alt"):
                    setattr(self, i, getattr(expression, i, None))

        def __call__(self):
@@ -123,10 +157,13 @@ init -1500 python:
        # Note: This had been documented to take a boolean.

        def __init__(self, expression):
+            if isinstance(expression, (list, tuple)):
+                expression = _ActionList(expression)
+
            self.expression = expression

            if isinstance(expression, Action):
-                for i in ("get_selected", "get_sensitive", "get_tooltip", "periodic", "unhovered"):
+                for i in ("get_selected", "get_sensitive", "get_tooltip", "periodic", "unhovered", "alt"):
                    setattr(self, i, getattr(expression, i, None))

        def __call__(self):
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -163,7 +163,6 @@ init -1500 python in build:
        ("*.dll", None),
        ("*.manifest", None),
        ("*.keystore", None),
-        ( "**.rpe", None),
        ( "**.rpe.py", None),

        ("update.pem", None),
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -294,6 +294,7 @@ init -1100 python:
        if _compat_versions(version, (7, 6, 1), (8, 1, 1)):
            config.tts_front_to_back = False
            _greedy_rollback = False
+            config.dissolve_shrinks = True

        if _compat_versions(version, (7, 6, 99), (8, 1, 99)):
            config.simple_box_reverse = True
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
--- a/Show More
+++ b/Show More