Maintain access convention within save compat

(cherry picked from commit 7ca17b7ba781b649da2a729d8f8d9b45f69fd37b)

game/scripts/cds.rpy

@@ -1,5 +1,14 @@
 python early hide:
     import inspect
+
+    try:
+        from renpy.lint import python_builtins, renpy_builtins
+    except ImportError:
+        import builtins
+        python_builtins = set(dir(builtins))
+        del builtins
+        renpy_builtins = set()
+
     __register_params = frozenset(inspect.signature(renpy.register_statement).parameters).difference({"name", "parse"})
     def register_decorator(cls):
         """
@@ -54,6 +63,12 @@ python early hide:
             evaled = {n: eval(e) for n, e in self.items()}
             renpy.dynamic(**evaled)
 
+        def lint(self):
+            for domain, st in (("Python", python_builtins), ("Ren'Py", renpy_builtins)):
+                inter = st.intersection(self)
+                if inter:
+                    renpy.error(f"Dynamic statement redefines one or several {domain} builtins: {', '.join(map(repr, inter))}")
+
     @register_decorator
     class chibi:
         @staticmethod

game/scripts/characters/luna/summon.rpy

@@ -95,6 +95,7 @@ label update_lun_tier:
         # T5 NOT AVAILABLE
         return
 
+        # unreachable
         # Requirement: Tier 4 - Blow me T4 E3
         $ lun_level_up = 4
     return

game/scripts/events/DayNight.rpy

@@ -145,6 +145,7 @@ label day_start:
     # Start Quests
     jump quests
 
+    # unreachable
     $ renpy.choice_for_skipping()
 
     call screen room_menu
@@ -239,6 +240,7 @@ label night_start:
     # Start Quests
     jump quests
 
+    # unreachable
     $ renpy.choice_for_skipping()
 
     call screen room_menu

game/scripts/events/labels.rpy

@@ -142,18 +142,24 @@ label teleport(position=None,effect=True,poof_label=None):
         with d1
 
         hide screen blkfade
-        show screen heal_animation
+        show heal_ani onlayer screens zorder teleport_zorder:
+            anchor (0.5, 1.0)
+            pos teleport_pos
+            zoom 0.5
         with d3
 
     #stop music fadeout 1
 
-    hide screen heal_animation
+    hide heal_animation onlayer screens
     if poof_label is not None:
-        $ renpy.call(poof_label)
+        call expression poof_label
-    show screen teleport_animation
+    show teleport_ani onlayer screens zorder teleport_zorder:
+        anchor (0.5, 0.7)
+        pos teleport_pos
+        zoom 0.5
     with d5
 
-    hide screen teleport_animation
+    hide teleport_animation onlayer screens
     with d5
 
     if effect == True:
@@ -161,17 +167,9 @@ label teleport(position=None,effect=True,poof_label=None):
 
     return
 
-screen teleport_animation():
-    add "teleport_ani" anchor (0.5, 0.7) xpos teleport_xpos ypos teleport_ypos zoom 0.5
-    zorder teleport_zorder
-
-screen heal_animation():
-    add "heal_ani" anchor (0.5, 1.0) xpos teleport_xpos ypos teleport_ypos zoom 0.5
-    zorder teleport_zorder
-
 # Dummy labels. To prevent crashes. # TODO: Remove later.
 default hermione_action = None
 
 label set_her_action(action=None, update=None):
     $ hermione_action = action
-    return
+    return

game/scripts/events/queue.rpy

@@ -156,8 +156,8 @@ init -1 python:
 
         if config.developer:
             def __setattr__(self, attr, value):
-                if hasattr(self, attr) and getattr(self, attr) != value:
+                if getattr(self, attr, not value) != value:
-                    id = getattr(self, "id")
+                    id = self.id
                     rollback = f"{stdcol.UNDERLINE}(Rollback){stdcol.END} " if renpy.in_rollback() else ""
                     caller_id = renpy.get_filename_line()
 

game/scripts/mods.rpy

@@ -3,7 +3,7 @@ init -999:
         import json
         import os
 
-        if not getattr(persistent, "mods_enabled"):
+        if not persistent.mods_enabled:
             persistent.mods_enabled = _set()
 
         mods_list = _dict()