diff --git a/worlds/tunic/er_data.py b/worlds/tunic/er_data.py index 6e57608730..2e3aeb305c 100644 --- a/worlds/tunic/er_data.py +++ b/worlds/tunic/er_data.py @@ -736,13 +736,13 @@ traversal_requirements: Dict[str, Dict[str, List[List[str]]]] = { "Overworld to Atoll Upper": [["Hyperdash"]], "Overworld Belltower": - [["Hyperdash"], ["UR"]], + [["Hyperdash"], ["LS1"]], "Overworld Swamp Upper Entry": - [["Hyperdash"], ["UR"]], + [["Hyperdash"], ["LS1"]], "Overworld Swamp Lower Entry": [], "Overworld Special Shop Entry": - [["Hyperdash"], ["UR"]], + [["Hyperdash"], ["LS1"]], "Overworld Well Ladder": [], "Overworld Ruined Passage Door": @@ -760,9 +760,9 @@ traversal_requirements: Dict[str, Dict[str, List[List[str]]]] = { "Overworld after Envoy": [], "Overworld Quarry Entry": - [["NMG"]], + [["IG2"], ["LS1"]], "Overworld Tunnel Turret": - [["NMG"], ["Hyperdash"]], + [["IG1"], ["Hyperdash"]], "Overworld Temple Door": [["NMG"], ["Forest Belltower Upper", "Overworld Belltower"]], "Overworld Southeast Cross Door": diff --git a/worlds/tunic/er_rules.py b/worlds/tunic/er_rules.py index c62bfef465..4f404bb444 100644 --- a/worlds/tunic/er_rules.py +++ b/worlds/tunic/er_rules.py @@ -1060,6 +1060,9 @@ def set_er_region_rules(world: "TunicWorld", regions: Dict[str, Region], portal_ ladder_regions[ladder_region].connect( connecting_region=regions[dest_region], name=ladder_region + " (LS) " + dest_region) + # well rail, need height off portal pad for one side, and a tiny extra from stairs on the other + ls_connect("LS Elev 3", "Overworld Redux, Sewer_west_aqueduct") + ls_connect("LS Elev 3", "Overworld Redux, Furnace_gyro_upper_north") # connect ls elevation regions to portals where you need to get behind the map to enter it if options.ladder_storage >= LadderStorage.option_hard: diff --git a/worlds/tunic/er_scripts.py b/worlds/tunic/er_scripts.py index 8689a51b76..20409a338f 100644 --- a/worlds/tunic/er_scripts.py +++ b/worlds/tunic/er_scripts.py @@ -133,6 +133,8 @@ def pair_portals(world: "TunicWorld") -> Dict[Portal, Portal]: player_name = world.multiworld.get_player_name(world.player) portal_map = portal_mapping.copy() logic_rules = world.options.logic_rules.value + ice_grappling = world.options.ice_grappling.value + ladder_storage = world.options.ladder_storage.value fixed_shop = world.options.fixed_shop laurels_location = world.options.laurels_location traversal_reqs = deepcopy(traversal_requirements) @@ -175,7 +177,7 @@ def pair_portals(world: "TunicWorld") -> Dict[Portal, Portal]: elif dead_end_status == DeadEnd.all_cats: dead_ends.append(portal) elif dead_end_status == DeadEnd.restricted: - if logic_rules: + if ice_grappling: two_plus.append(portal) else: dead_ends.append(portal)