Merge branch 'refs/heads/dev'

* Fixed inconsistent spacing
* Fixed inconsistent state var access

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/doll/chibi.rpy

@@ -211,11 +211,9 @@ init 5 python:
 
             self.set_pose(pose or self.walk)
 
-            # Note: Warper names and their count can change over time,
-            # so it's easier to just evaluate the input.
             # List of available warpers:
             # https://www.renpy.org/doc/html/atl.html?#warpers
-            warper = eval(f"_warper.{warper}")
+            warper = getattr(_warper, warper, _warper.linear)
 
             distances = []
             times = []

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)
-    show screen teleport_animation
+        call expression poof_label
+    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,14 +167,6 @@ 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
 

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()

game/scripts/script.rpy

@@ -75,12 +75,20 @@ label start_dev:
         states.cho.ev.intro.e1_complete = True
         states.cho.ev.intro.e2_complete = True
         states.cho.ev.intro.e4_complete = True
+
         states.sna.ev.hangouts.cho_e1 = True
 
         states.paperwork_unlocked = True
 
-        store.states.lun.ev.intro.e1_complete = True
-        store.states.lun.ev.intro.e2_complete = True
+        states.lun.ev.intro.e1_complete = True
+        states.lun.ev.intro.e2_complete = True
+        states.lun.ev.quibbler.stocked = True
+        thequibbler_ITEM.used = True
+        states.lun.ev.spectrespecs.e1_complete = True
+        states.lun.ev.spectrespecs.e2_complete = True
+        states.lun.ev.spectrespecs.e3_complete = True
+        states.lun.ev.spectrespecs.e4_complete = True
+        states.lun.favors_unlocked = True
 
         for i in mirror.items:
             i.unlocked = True

game/scripts/shaders.rpy

@@ -34,6 +34,63 @@ init python:
         gl_FragColor = vec4(mix(gl_FragColor.xyz, gl_FragColor.xyz * ctemp2rgb(ctemp), u_strength), 1.0);
     """)
 
+    renpy.register_shader("pixelatemaskshader", variables="""
+        uniform sampler2D tex0;
+        uniform sampler2D tex1;
+        uniform vec2 res0;
+        uniform float u_step;
+        uniform float u_lod_bias;
+        attribute vec2 a_tex_coord;
+        varying vec2 v_tex_coord;
+    """, vertex_600="""
+        v_tex_coord = a_tex_coord;
+    """, fragment_functions="""
+        vec2 CalculateNewUV(vec2 uv, vec2 size, float step) {
+            float dx = (step / size.x);
+            float dy = (step / size.y);
+            return vec2(dx*(floor(uv.x/dx) + 0.5), dy*(floor(uv.y/dy) + 0.5));
+        }
+
+        vec4 PixelateMask(sampler2D source, float alpha, vec2 size, vec2 uv, float step, float lod) {
+            if (alpha > 0.0) {
+                vec2 new_uv = CalculateNewUV(uv, size, step);
+                vec4 old = vec4(texture2D(source, uv, lod).rgb, 1.0);
+                vec4 new = vec4(texture2D(source, new_uv, lod).rgb, 1.0);
+                return mix(old, new, alpha);
+            }
+
+            return texture2D(source, uv, lod);
+        }
+    """, fragment_600="""
+        float alpha = texture2D(tex1, v_tex_coord).a;
+        gl_FragColor = PixelateMask(tex0, alpha, res0, v_tex_coord, u_step, u_lod_bias);
+        """)
+
+    class PixelateMask(renpy.Displayable, NoRollback):
+        def __init__(self, child, mask, step=1.0, **kwargs):
+            super().__init__(**kwargs)
+            self.child = renpy.displayable(child)
+            self.mask = renpy.displayable(mask)
+            self.step = step
+
+        def render(self, width, height, st, at):
+            child = renpy.display.render.render(self.child, width, height, st, at)
+            mask = renpy.display.render.render(self.mask, width, height, st, at)
+
+            rv = renpy.display.render.Render(width, height)
+
+            if renpy.display.render.models:
+
+                rv.mesh = True
+                rv.add_shader("pixelatemaskshader")
+                rv.add_uniform("u_step", self.step)
+
+            rv.blit(child, (0, 0))
+            rv.blit(mask, (0, 0))
+
+            renpy.redraw(self, 0)
+            return rv
+
 transform color_temperature(factor=1.0, strength=1.0):
     mesh True
     shader "color_temperature_shader"