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

Moving OWG connection creation to after Mixed OWR but before Crossed/Layout OWR

Browse Source
This commit is contained in:
codemann8
2022-10-24 20:17:44 -05:00
parent 9b2d13bcd0
commit 1912504c93
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Main.py
View File

@@ -187,8 +187,6 @@ def main(args, seed=None, fish=None):
link_overworld(world, player) link_overworld(world, player)
create_shops(world, player) create_shops(world, player)
update_world_regions(world, player) update_world_regions(world, player)
if world.logic[player] in ('owglitches', 'nologic'):
create_owg_connections(world, player)
create_flute_exits(world, player) create_flute_exits(world, player)
logger.info(world.fish.translate("cli","cli","shuffling.world")) logger.info(world.fish.translate("cli","cli","shuffling.world"))
@@ -462,13 +460,13 @@ def copy_world(world):
for player in range(1, world.players + 1): for player in range(1, world.players + 1):
create_regions(ret, player) create_regions(ret, player)
update_world_regions(ret, player) update_world_regions(ret, player)
if world.logic[player] in ('owglitches', 'nologic'):
create_owg_connections(ret, player)
create_flute_exits(ret, player) create_flute_exits(ret, player)
create_dungeon_regions(ret, player) create_dungeon_regions(ret, player)
create_shops(ret, player) create_shops(ret, player)
create_rooms(ret, player) create_rooms(ret, player)
create_dungeons(ret, player) create_dungeons(ret, player)
if world.logic[player] in ('owglitches', 'nologic'):
create_owg_connections(ret, player)
# there are region references here they must be migrated to preserve integrity # there are region references here they must be migrated to preserve integrity
# ret.exp_cache = world.exp_cache.copy() # ret.exp_cache = world.exp_cache.copy()

3
OverworldShuffle.py
View File

@@ -176,6 +176,9 @@ def link_overworld(world, player):
connect_simple(world, exitname, regionname, player) connect_simple(world, exitname, regionname, player)
categorize_world_regions(world, player) categorize_world_regions(world, player)
if world.logic[player] in ('owglitches', 'nologic'):
create_owg_connections(world, player)
# crossed shuffle # crossed shuffle
logging.getLogger('').debug('Crossing overworld edges') logging.getLogger('').debug('Crossing overworld edges')