Compare commits

..

3 Commits

Author SHA1 Message Date
c64635aace Save calling update_character_map_locations several times 2023-11-16 00:49:14 +01:00
ef62f74eed replace equivalent with statement 2023-11-16 00:14:04 +01:00
9a3fe1df65 Reform random map locations
the locations of the different characters aren't independant, but they weren't in the first place
2023-11-16 00:13:42 +01:00
3 changed files with 59 additions and 76 deletions

View File

@ -5,7 +5,7 @@ label hermione_map_BJ:
$ her_outfit_last.save() $ her_outfit_last.save()
$ hermione.equip(her_outfit_s_rain) $ hermione.equip(her_outfit_s_rain)
$ renpy.call('forest_BJ_'+str(states.her.ev.forest_bj.stage)) call expression 'forest_BJ_'+str(states.her.ev.forest_bj.stage)
$ states.her.busy = True $ states.her.busy = True
call set_her_map_location("gryffindor_room") call set_her_map_location("gryffindor_room")

View File

@ -1,4 +1,3 @@
label day_start: label day_start:
show screen blkfade show screen blkfade
hide snape_main hide snape_main
@ -87,7 +86,7 @@ label day_start:
# Randomisers # Randomisers
random_gold = renpy.random.randint(8, 40) random_gold = renpy.random.randint(8, 40)
random_map_loc = renpy.random.randint(1, 5) map_randomobj = renpy.random.Random()
# Send salary every 7th day # Send salary every 7th day
if game.day % 7 == 0: if game.day % 7 == 0:
@ -101,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
@ -201,16 +194,10 @@ label night_start:
# Randomisers # Randomisers
random_gold = renpy.random.randint(8, 40) random_gold = renpy.random.randint(8, 40)
random_map_loc = renpy.random.randint(1, 5) 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

File diff suppressed because it is too large Load Diff