SilverStudioGames/WTS
SilverStudioGames/WTS
2
0
Fork 1
Code Issues Pull Requests Wiki Activity

Avoid using lists

Browse Source 
(cherry picked from commit 78230893a8)
This commit is contained in:
Gouvernathor 2023-11-15 03:12:24 +01:00 committed by LoafyLemon
parent 94404f4ed7
commit 094b010b7a
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
game/scripts/characters/cho/events/quidditch/slytherin_match.rpy
View File

@ -1344,7 +1344,7 @@ label slytherin_match:
call gen_chibi("stand_alt", 300, 365, flip=False) call gen_chibi("stand_alt", 300, 365, flip=False)
call sna_chibi("stand", 215, 360, flip=True) 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 background fadeout 4
stop music fadeout 2 stop music fadeout 2

15
game/scripts/rooms/quidditch_stands/init.rpy
View File

@ -5,17 +5,17 @@ default quidditch_stands = {
"weather": "sun_high", "weather": "sun_high",
"rain": False, "rain": False,
"puddles": False, "puddles": False,
"crowd": [], "crowd": (),
"crowd_react": [None, None, None], "crowd_react": (None, None, None),
"spotlight": False, "spotlight": False,
"hole": False, "hole": False,
"tree_fire": False "tree_fire": False
} }
# Crowd density presets # Crowd density presets
define crowd_few = ["low_1"] define crowd_few = ("low_1")
define crowd_mid = ["low_1", "low_2", "tower_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_full = ("low_1", "low_2", "low_3", "low_4", "tower_1", "tower_2")
image quidditch_stands rain_heavy: image quidditch_stands rain_heavy:
"images/rooms/quidditch_stands/rain/heavy_0.webp" "images/rooms/quidditch_stands/rain/heavy_0.webp"
@ -64,7 +64,7 @@ label quidditch_stands(hidden=False, reset=False, **kwargs):
return 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 zorder 0
add "images/rooms/quidditch_stands/bg_{}.webp".format(weather) zoom 0.5 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: if tree_fire:
add "quid_stands_fire" pos (870, -15) 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 add "images/rooms/quidditch_stands/crowd_{}.webp".format(c) zoom 0.5
if crowd_bj: if crowd_bj:
@ -161,4 +161,3 @@ label test_stands:
call quidditch_stands(weather="overcast", crowd=["bj"]) call quidditch_stands(weather="overcast", crowd=["bj"])
pause 1 pause 1
jump test_stands jump test_stands

8
game/scripts/rooms/quidditch_stands2/init.rpy
View File

@ -3,8 +3,8 @@
default quidditch_stands2 = { default quidditch_stands2 = {
"weather": "sun_high", "weather": "sun_high",
"crowd": [], "crowd": (),
"crowd_react": [None, None, None], "crowd_react": (None, None, None),
} }
label quidditch_stands2(hidden=False, reset=False, **kwargs): 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) show screen quidditch_stands_front2(**quidditch_stands2)
return 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 zorder 0
add "images/rooms/quidditch_stands2/bg_{}.webp".format(weather) zoom 0.5 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 "images/rooms/quidditch_stands2/crowd_{}.webp".format(c) zoom 0.5
add crowd_react[0] pos (570, 140) add crowd_react[0] pos (570, 140)