diff --git a/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy index c26a0c8d..1b98e2cd 100644 --- a/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy @@ -1344,7 +1344,7 @@ label slytherin_match: call gen_chibi("stand_alt", 300, 365, flip=False) call sna_chibi("stand", 215, 360, flip=True) - call quidditch_stands(crowd=[], crowd_react=[None, None, None]) + call quidditch_stands(crowd=(), crowd_react=(None, None, None)) stop background fadeout 4 stop music fadeout 2 diff --git a/game/scripts/rooms/quidditch_stands/init.rpy b/game/scripts/rooms/quidditch_stands/init.rpy index af8f97aa..e1120157 100644 --- a/game/scripts/rooms/quidditch_stands/init.rpy +++ b/game/scripts/rooms/quidditch_stands/init.rpy @@ -5,17 +5,17 @@ default quidditch_stands = { "weather": "sun_high", "rain": False, "puddles": False, - "crowd": [], - "crowd_react": [None, None, None], + "crowd": (), + "crowd_react": (None, None, None), "spotlight": False, "hole": False, "tree_fire": False } # Crowd density presets -define crowd_few = ["low_1"] -define crowd_mid = ["low_1", "low_2", "tower_1"] -define crowd_full = ["low_1", "low_2", "low_3", "low_4", "tower_1", "tower_2"] +define crowd_few = ("low_1") +define crowd_mid = ("low_1", "low_2", "tower_1") +define crowd_full = ("low_1", "low_2", "low_3", "low_4", "tower_1", "tower_2") image quidditch_stands rain_heavy: "images/rooms/quidditch_stands/rain/heavy_0.webp" @@ -64,7 +64,7 @@ label quidditch_stands(hidden=False, reset=False, **kwargs): return -screen quidditch_stands_back(weather, rain=False, crowd=[], crowd_bj=False, crowd_react=[None, None, None], tree_fire=False, puddles=False, **kwargs): +screen quidditch_stands_back(weather, rain=False, crowd=(), crowd_bj=False, crowd_react=(None, None, None), tree_fire=False, puddles=False, **kwargs): zorder 0 add "images/rooms/quidditch_stands/bg_{}.webp".format(weather) zoom 0.5 @@ -72,7 +72,7 @@ screen quidditch_stands_back(weather, rain=False, crowd=[], crowd_bj=False, crow if tree_fire: add "quid_stands_fire" pos (870, -15) - for c in set(crowd): + for c in crowd: add "images/rooms/quidditch_stands/crowd_{}.webp".format(c) zoom 0.5 if crowd_bj: @@ -161,4 +161,3 @@ label test_stands: call quidditch_stands(weather="overcast", crowd=["bj"]) pause 1 jump test_stands - diff --git a/game/scripts/rooms/quidditch_stands2/init.rpy b/game/scripts/rooms/quidditch_stands2/init.rpy index e2b04830..8f310226 100644 --- a/game/scripts/rooms/quidditch_stands2/init.rpy +++ b/game/scripts/rooms/quidditch_stands2/init.rpy @@ -3,8 +3,8 @@ default quidditch_stands2 = { "weather": "sun_high", - "crowd": [], - "crowd_react": [None, None, None], + "crowd": (), + "crowd_react": (None, None, None), } label quidditch_stands2(hidden=False, reset=False, **kwargs): @@ -16,12 +16,12 @@ label quidditch_stands2(hidden=False, reset=False, **kwargs): show screen quidditch_stands_front2(**quidditch_stands2) return -screen quidditch_stands_back2(weather, crowd=[], crowd_react=[None, None, None], **kwargs): +screen quidditch_stands_back2(weather, crowd=(), crowd_react=(None, None, None), **kwargs): zorder 0 add "images/rooms/quidditch_stands2/bg_{}.webp".format(weather) zoom 0.5 - for c in set(crowd): + for c in crowd: add "images/rooms/quidditch_stands2/crowd_{}.webp".format(c) zoom 0.5 add crowd_react[0] pos (570, 140)