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

Factorize jumps in the elif

Browse Source 
(cherry picked from commit 6dc1a04810)
This commit is contained in:
Gouvernathor 2023-11-15 01:07:16 +01:00 committed by LoafyLemon
parent 67e589f47f
commit 11047626e1
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
game/scripts/rooms/main_room/objects/desk.rpy
View File

@ -51,10 +51,9 @@ label desk:
if states.her.busy: if states.her.busy:
if game.daytime: if game.daytime:
nar "Hermione is taking classes." nar "Hermione is taking classes."
jump main_room_menu
else: else:
nar "Hermione is already asleep." nar "Hermione is already asleep."
jump main_room_menu jump main_room_menu
else: else:
if states.her.map_location == "forest": if states.her.map_location == "forest":
nar "Hermione is currently at the Forbidden Forest.\n>Would you like to go there?" nar "Hermione is currently at the Forbidden Forest.\n>Would you like to go there?"
@ -71,10 +70,9 @@ label desk:
if states.lun.busy: if states.lun.busy:
if game.daytime: if game.daytime:
nar "Luna is taking classes." nar "Luna is taking classes."
jump main_room_menu
else: else:
nar "Luna is already asleep." nar "Luna is already asleep."
jump main_room_menu jump main_room_menu
else: else:
jump summon_luna jump summon_luna
@ -83,10 +81,9 @@ label desk:
if states.ast.busy: if states.ast.busy:
if game.daytime: if game.daytime:
nar "Astoria is taking classes." nar "Astoria is taking classes."
jump main_room_menu
else: else:
nar "Astoria is already asleep." nar "Astoria is already asleep."
jump main_room_menu jump main_room_menu
else: #Summoning after intro events done. else: #Summoning after intro events done.
jump summon_astoria jump summon_astoria
@ -95,10 +92,9 @@ label desk:
if states.sus.busy: if states.sus.busy:
if game.daytime: if game.daytime:
nar "Susan is taking classes." nar "Susan is taking classes."
jump main_room_menu
else: else:
nar "Susan is already asleep." nar "Susan is already asleep."
jump main_room_menu jump main_room_menu
else: else:
jump summon_susan jump summon_susan
@ -107,10 +103,9 @@ label desk:
if states.cho.busy: if states.cho.busy:
if game.daytime: if game.daytime:
nar "Cho is taking classes." nar "Cho is taking classes."
jump main_room_menu
else: else:
nar "Cho is already asleep." nar "Cho is already asleep."
jump main_room_menu jump main_room_menu
else: else:
jump summon_cho jump summon_cho
@ -118,10 +113,7 @@ label desk:
elif __choice == "snape": elif __choice == "snape":
if states.sna.busy: if states.sna.busy:
nar "Professor Snape is unavailable." nar "Professor Snape is unavailable."
if game.daytime: jump main_room_menu
jump main_room_menu
else:
jump main_room_menu
else: else:
jump summon_snape jump summon_snape
@ -129,10 +121,7 @@ label desk:
elif __choice == "tonks": elif __choice == "tonks":
if states.ton.busy: if states.ton.busy:
nar "Tonks is unavailable." nar "Tonks is unavailable."
if game.daytime: jump main_room_menu
jump main_room_menu
else:
jump main_room_menu
else: else:
jump summon_tonks jump summon_tonks