Compare commits

..

No commits in common. "908beae5d3d5f00ae51e7277364938966d0ba7d4" and "2566ef665f541c3351d25bcb3833ee94242db14d" have entirely different histories.

7 changed files with 54 additions and 70 deletions

View File

@ -1,14 +1,5 @@
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):
"""
@ -63,12 +54,6 @@ 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

View File

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

View File

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

View File

@ -142,24 +142,18 @@ label teleport(position=None,effect=True,poof_label=None):
with d1
hide screen blkfade
show heal_ani onlayer screens zorder teleport_zorder:
anchor (0.5, 1.0)
pos teleport_pos
zoom 0.5
show screen heal_animation
with d3
#stop music fadeout 1
hide heal_animation onlayer screens
hide screen heal_animation
if poof_label is not None:
call expression poof_label
show teleport_ani onlayer screens zorder teleport_zorder:
anchor (0.5, 0.7)
pos teleport_pos
zoom 0.5
$ renpy.call(poof_label)
show screen teleport_animation
with d5
hide teleport_animation onlayer screens
hide screen teleport_animation
with d5
if effect == True:
@ -167,9 +161,17 @@ 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

View File

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

View File

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

File diff suppressed because it is too large Load Diff