Avoid using reset_variables

This commit is contained in:
Gouvernathor 2023-11-15 03:13:55 +01:00
parent bde6a30acc
commit 757a39d782
2 changed files with 10 additions and 8 deletions

View File

@ -1,7 +1,6 @@
# Quidditch stands # Quidditch stands
default quidditch_stands = { define __quidditch_stands = {
"weather": "sun_high", "weather": "sun_high",
"rain": False, "rain": False,
"puddles": False, "puddles": False,
@ -11,6 +10,7 @@ default quidditch_stands = {
"hole": False, "hole": False,
"tree_fire": False "tree_fire": False
} }
default quidditch_stands = __quidditch_stands.copy()
# Crowd density presets # Crowd density presets
define crowd_few = ("low_1") define crowd_few = ("low_1")
@ -55,8 +55,9 @@ label quidditch_stands(hidden=False, reset=False, **kwargs):
# Update and show the area. # Update and show the area.
# Pass `hidden=True` to update only, `reset=True` to reset the area before applying arguments. # Pass `hidden=True` to update only, `reset=True` to reset the area before applying arguments.
if reset: if reset:
$ reset_variables("quidditch_stands") $ quidditch_stands = __quidditch_stands | kwargs
$ quidditch_stands.update(kwargs) else:
$ quidditch_stands.update(kwargs)
if not hidden: if not hidden:
show screen quidditch_stands_back(**quidditch_stands) show screen quidditch_stands_back(**quidditch_stands)
show screen quidditch_stands_mid(**quidditch_stands) show screen quidditch_stands_mid(**quidditch_stands)

View File

@ -1,16 +1,17 @@
# Quidditch stands # Quidditch stands
default quidditch_stands2 = { define __quidditch_stands2 = {
"weather": "sun_high", "weather": "sun_high",
"crowd": (), "crowd": (),
"crowd_react": (None, None, None), "crowd_react": (None, None, None),
} }
default quidditch_stands2 = __quidditch_stands2.copy()
label quidditch_stands2(hidden=False, reset=False, **kwargs): label quidditch_stands2(hidden=False, reset=False, **kwargs):
if reset: if reset:
$ reset_variables("quidditch_stands2") $ quidditch_stands2 = __quidditch_stands2 | kwargs
$ quidditch_stands2.update(kwargs) else:
$ quidditch_stands2.update(kwargs)
if not hidden: if not hidden:
show screen quidditch_stands_back2(**quidditch_stands2) show screen quidditch_stands_back2(**quidditch_stands2)
show screen quidditch_stands_front2(**quidditch_stands2) show screen quidditch_stands_front2(**quidditch_stands2)