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

Improvement to copy_world_premature

Browse Source
This commit is contained in:
codemann8
2022-10-31 16:13:52 -05:00
parent 4639db8b2a
commit e4d760a00c
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Main.py
View File

@@ -639,18 +639,24 @@ def copy_world_premature(world, player):
connection.connect(target) connection.connect(target)
# connect copied world # connect copied world
copied_locations = {(loc.name, loc.player): loc for loc in ret.get_locations()} # caches all locations copied_locations = {(loc.name, loc.player): loc for loc in ret.get_locations() if loc.player == player} # caches all locations
for region in world.regions: for region in world.regions:
if region.player == player: if region.player == player:
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 if region.dungeon:
copied_region.is_dark_world = region.is_dark_world copied_region.dungeon = ret.get_dungeon(region.dungeon.name, region.player)
copied_region.dungeon = region.dungeon
copied_region.locations = [copied_locations[(location.name, location.player)] for location in region.locations if (location.name, location.player) in copied_locations] copied_region.locations = [copied_locations[(location.name, location.player)] for location in region.locations if (location.name, location.player) in copied_locations]
for location in copied_region.locations: for location in copied_region.locations:
location.parent_region = copied_region 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) copied_region.entrances.append(ret.get_entrance(entrance.name, entrance.player))
for exit in region.exits:
if exit.connected_region:
dest_region = ret.get_region(exit.connected_region.name, region.player)
ret.get_entrance(exit.name, exit.player).connect(dest_region)
from OverworldShuffle import categorize_world_regions
categorize_world_regions(ret, player)
for item in world.precollected_items: for item in world.precollected_items:
if item.player == player: if item.player == player:
@@ -659,22 +665,19 @@ def copy_world_premature(world, player):
for edge in world.owedges: for edge in world.owedges:
if edge.player == player and edge.dest: if edge.player == player and edge.dest:
copiededge = ret.check_for_owedge(edge.name, edge.player) copiededge = ret.check_for_owedge(edge.name, edge.player)
if copiededge is not None:
copiededge.dest = ret.check_for_owedge(edge.dest.name, edge.dest.player) copiededge.dest = ret.check_for_owedge(edge.dest.name, edge.dest.player)
for door in world.doors: for door in world.doors:
if door.player == player: if door.player == player:
entrance = ret.check_for_entrance(door.name, door.player) copied_door = ret.check_for_door(door.name, door.player)
if entrance is not None: copied_entrance = ret.check_for_entrance(door.name, door.player)
destdoor = ret.check_for_door(entrance.door.name, entrance.door.player) copied_door.entrance = copied_entrance
entrance.door = destdoor copied_entrance.door = copied_door
if destdoor is not None:
destdoor.entrance = entrance
ret.key_logic = world.key_logic.copy() for player, portals in world.dungeon_portals.items():
for portal in portals:
connect_portal(portal, ret, player)
from OverworldShuffle import categorize_world_regions
categorize_world_regions(ret, player)
set_rules(ret, player) set_rules(ret, player)
return ret return ret