alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Set location's parent_region when moving it.

Browse Source 
Fix copy_world to handle moved locations
This commit is contained in:
compiling
2020-11-08 12:33:31 +11:00
parent af488e653e
commit bdddd3c0de
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Main.py
View File

@@ -421,6 +421,9 @@ def copy_world(world):
copied_region = ret.get_region(region.name, region.player) copied_region = ret.get_region(region.name, region.player)
copied_region.is_light_world = region.is_light_world copied_region.is_light_world = region.is_light_world
copied_region.is_dark_world = region.is_dark_world copied_region.is_dark_world = region.is_dark_world
copied_region.locations = [copy.copy(location) for location in region.locations]
for location in copied_region.locations:
location.parent_region = copied_region
for entrance in region.entrances: for entrance in region.entrances:
ret.get_entrance(entrance.name, entrance.player).connect(copied_region) ret.get_entrance(entrance.name, entrance.player).connect(copied_region)

1
PotShuffle.py
View File

@@ -314,6 +314,7 @@ def shuffle_pots(world, player):
key = next(location for location in world.get_region(old_pot.room, player).locations if location.name in key_drop_data) key = next(location for location in world.get_region(old_pot.room, player).locations if location.name in key_drop_data)
world.get_region(old_pot.room, player).locations.remove(key) world.get_region(old_pot.room, player).locations.remove(key)
world.get_region(new_pot.room, player).locations.append(key) world.get_region(new_pot.room, player).locations.append(key)
key.parent_region = world.get_region(new_pot.room, player)
elif new_pot.item == PotItem.Switch and (new_pot.flags & PotFlags.SwitchLogicChange): elif new_pot.item == PotItem.Switch and (new_pot.flags & PotFlags.SwitchLogicChange):
if new_pot.room == 'PoD Basement Ledge': if new_pot.room == 'PoD Basement Ledge':
basement = world.get_region(old_pot.room, player) basement = world.get_region(old_pot.room, player)