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

Fixed duplicate exit issue in copy_world

Browse Source
This commit is contained in:
codemann8
2023-12-29 03:51:49 -06:00
parent 121091c5a3
commit eb0276926d
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Main.py
View File

@@ -635,8 +635,11 @@ def copy_world(world):
if exit.connected_region: if exit.connected_region:
dest_region = ret.get_region(exit.connected_region.name, region.player) dest_region = ret.get_region(exit.connected_region.name, region.player)
src_exit = ret.get_entrance(exit.name, exit.player) src_exit = ret.get_entrance(exit.name, exit.player)
if exit.name not in [e.name for e in dest_region.entrances]: if exit.name not in [e.name for e in dest_region.entrances if e.connected_region is not None]:
src_exit.connect(dest_region) if exit.name in [e.name for e in dest_region.entrances]:
src_exit.connected_region = dest_region
else:
src_exit.connect(dest_region)
# fill locations # fill locations
for location in world.get_locations(): for location in world.get_locations():
@@ -799,8 +802,11 @@ def copy_world_premature(world, player):
if exit.connected_region: if exit.connected_region:
dest_region = ret.get_region(exit.connected_region.name, region.player) dest_region = ret.get_region(exit.connected_region.name, region.player)
src_exit = ret.get_entrance(exit.name, exit.player) src_exit = ret.get_entrance(exit.name, exit.player)
if exit.name not in [e.name for e in dest_region.entrances]: if exit.name not in [e.name for e in dest_region.entrances if e.connected_region is not None]:
src_exit.connect(dest_region) if exit.name in [e.name for e in dest_region.entrances]:
src_exit.connected_region = dest_region
else:
src_exit.connect(dest_region)
from OverworldShuffle import categorize_world_regions from OverworldShuffle import categorize_world_regions
categorize_world_regions(ret, player) categorize_world_regions(ret, player)