From 1912504c93bb16065a9028687734c0876ba01302 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Mon, 24 Oct 2022 20:17:44 -0500 Subject: [PATCH] Moving OWG connection creation to after Mixed OWR but before Crossed/Layout OWR --- Main.py | 6 ++---- OverworldShuffle.py | 3 +++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Main.py b/Main.py index 8e7eaa97..0efc38ff 100644 --- a/Main.py +++ b/Main.py @@ -187,8 +187,6 @@ def main(args, seed=None, fish=None): link_overworld(world, player) create_shops(world, player) update_world_regions(world, player) - if world.logic[player] in ('owglitches', 'nologic'): - create_owg_connections(world, player) create_flute_exits(world, player) 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): create_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_dungeon_regions(ret, player) create_shops(ret, player) create_rooms(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 # ret.exp_cache = world.exp_cache.copy() diff --git a/OverworldShuffle.py b/OverworldShuffle.py index d90846ee..034c68aa 100644 --- a/OverworldShuffle.py +++ b/OverworldShuffle.py @@ -176,6 +176,9 @@ def link_overworld(world, player): connect_simple(world, exitname, regionname, player) categorize_world_regions(world, player) + + if world.logic[player] in ('owglitches', 'nologic'): + create_owg_connections(world, player) # crossed shuffle logging.getLogger('').debug('Crossing overworld edges')