diff --git a/worlds/tunic/__init__.py b/worlds/tunic/__init__.py index 0f50d79327..33f266f7ef 100644 --- a/worlds/tunic/__init__.py +++ b/worlds/tunic/__init__.py @@ -87,8 +87,7 @@ class TunicWorld(World): er_regions: Dict[str, RegionInfo] # absolutely needed so outlet regions work def generate_early(self) -> None: - if self.options.entrance_rando: - self.er_regions = tunic_er_regions.copy() + self.er_regions = tunic_er_regions.copy() if self.options.plando_connections: for index, cxn in enumerate(self.options.plando_connections): if (self.options.entrance_layout == EntranceLayout.option_direction_pairs @@ -432,7 +431,7 @@ class TunicWorld(World): "lanternless": self.options.lanternless.value, "maskless": self.options.maskless.value, "entrance_rando": int(bool(self.options.entrance_rando.value)), - "decoupled": self.options.decoupled.value, + "decoupled": self.options.decoupled.value if self.options.entrance_rando else 0, "shuffle_ladders": self.options.shuffle_ladders.value, "combat_logic": self.options.combat_logic.value, "Hexagon Quest Prayer": self.ability_unlocks["Pages 24-25 (Prayer)"], diff --git a/worlds/tunic/er_scripts.py b/worlds/tunic/er_scripts.py index 6a39aeab31..0635a917d2 100644 --- a/worlds/tunic/er_scripts.py +++ b/worlds/tunic/er_scripts.py @@ -686,7 +686,7 @@ def create_randomized_entrances(world: "TunicWorld", portal_pairs: Dict[Portal, regions[portal1.region].connect( connecting_region=regions[get_portal_outlet_region(portal2, world)], name=portal1.name) - if not world.options.decoupled: + if not world.options.decoupled or not world.options.entrance_rando: regions[portal2.region].connect( connecting_region=regions[get_portal_outlet_region(portal1, world)], name=portal2.name)