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

Save calling update_character_map_locations several times

Browse Source 
(cherry picked from commit c64635aace)
This commit is contained in:
Gouvernathor 2023-11-16 00:49:14 +01:00 committed by LoafyLemon
parent 38fa26e5bf
commit fd50b5d05a
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
game/scripts/events/DayNight.rpy
View File

@ -100,13 +100,7 @@ label day_start:
eventqueue.tick() eventqueue.tick()
# Update map locations # Update map locations
call set_her_map_location() call set_all_map_locations
call set_lun_map_location()
call set_cho_map_location()
call set_ast_map_location()
call set_sus_map_location()
#TODO: Add Tonks map location
#TODO: Add Snape map location
# Reset appearances and sprites # Reset appearances and sprites
call update_luna call update_luna
@ -203,13 +197,7 @@ label night_start:
map_randomobj = renpy.random.Random() map_randomobj = renpy.random.Random()
# Update map locations # Update map locations
call set_her_map_location() call set_all_map_locations
call set_lun_map_location()
call set_cho_map_location()
call set_ast_map_location()
call set_sus_map_location()
#TODO: Add Tonks map location
#TODO: Add Snape map location
# Reset appearances and sprites # Reset appearances and sprites
call update_luna call update_luna

27
game/scripts/interface/map.rpy
View File

@ -208,6 +208,18 @@ screen map_buttons():
tooltip "Toggles map folding animation" tooltip "Toggles map folding animation"
action ToggleVariable("map_animated", True, False) action ToggleVariable("map_animated", True, False)
label set_all_map_locations:
call set_her_map_location()
call set_lun_map_location()
call set_cho_map_location()
call set_ast_map_location()
call set_sus_map_location()
#TODO: Add Tonks map location
#TODO: Add Snape map location
call update_character_map_locations
return
label set_her_map_location(location=""): label set_her_map_location(location=""):
if location != "": if location != "":
@ -234,7 +246,8 @@ label set_her_map_location(location=""):
else: else:
$ states.her.map_location = __choice(("room_s", "courtyard", "room_g", "room_g", "room_g")) $ states.her.map_location = __choice(("room_s", "courtyard", "room_g", "room_g", "room_g"))
call update_character_map_locations if location:
call update_character_map_locations
return return
@ -251,7 +264,8 @@ label set_lun_map_location(location = ""):
else: #Random else: #Random
$ states.lun.map_location = __choice(("greenhouse", "forest", "forest", "room_r", "room_r")) $ states.lun.map_location = __choice(("greenhouse", "forest", "forest", "room_r", "room_r"))
call update_character_map_locations if location:
call update_character_map_locations
return return
@ -267,7 +281,8 @@ label set_ast_map_location(location = ""):
else: #Random else: #Random
$ states.ast.map_location = __choice(("courtyard", "courtyard", "room_s", "room_s", "room_s")) $ states.ast.map_location = __choice(("courtyard", "courtyard", "room_s", "room_s", "room_s"))
call update_character_map_locations if location:
call update_character_map_locations
return return
@ -281,7 +296,8 @@ label set_sus_map_location(location = ""):
else: #Random else: #Random
$ states.sus.map_location = __choice(("great_hall", "great_hall", "room_h", "room_h", "room_h")) $ states.sus.map_location = __choice(("great_hall", "great_hall", "room_h", "room_h", "room_h"))
call update_character_map_locations if location:
call update_character_map_locations
return return
@ -295,7 +311,8 @@ label set_cho_map_location(location = ""):
else: #Random else: #Random
$ states.cho.map_location = __choice(("training_grounds", "training_grounds", "room_r", "room_r", "room_r")) $ states.cho.map_location = __choice(("training_grounds", "training_grounds", "room_r", "room_r", "room_r"))
call update_character_map_locations if location:
call update_character_map_locations
return return