diff --git a/worlds/tunic/er_data.py b/worlds/tunic/er_data.py index 04b7e2a532..0d689875ec 100644 --- a/worlds/tunic/er_data.py +++ b/worlds/tunic/er_data.py @@ -1538,18 +1538,33 @@ traversal_requirements: Dict[str, Dict[str, List[List[str]]]] = { } # groups for ladders at the same elevation, for use in determing whether you can ls to entrances in diff rulesets -# need to consider the case of overworld beach -> somewhere with atoll ladder but no town ladders overworld_ladder_groups: Dict[str, List[str]] = { - # lowest elevation + # lowest elevation, in-line with swamp lower, rotating lights, atoll lower, west garden lower "Group 1": ["Ladders in Overworld Town", "Ladder to Ruined Atoll", "Ladder to Swamp"], - "Group 2": ["Ladders in Overworld Town", ] + # in-line with furnace from beach, swamp upper entrance + "Group 2": ["Ladders near Weathervane", "Ladders in Overworld Town", "Ladder to Swamp"], + # in-line with west garden upper, ruined passage + "Group 3": ["Ladders near Weathervane", "Ladders to West Bell"], + # in-line with old house door, chest above ruined passage + "Group 4": ["Ladders near Weathervane", "Ladder to Quarry", "Ladders to West Bell", "Ladders in Overworld Town"], + # skip top of top ladder next to weathervane level, does not provide logical access to anything + # in-line with quarry + "Group 5": ["Ladders near Dark Tomb", "Ladder to Quarry", "Ladders to West Bell", "Ladders in Overworld Town", + "Ladders in Well"], + # in-line with patrol cave, east forest, fortress, and stairs towards special shop + "Group 6": ["Ladders near Overworld Checkpoint", "Ladders near Patrol Cave"], + # skip top of belltower and middle of dark tomb ladders, does not grant access to anything + # in-line with temple rafters entrance, can get you to patrol cave ladders via knocking out of ls + "Group 7": ["Ladders near Patrol Cave", "Ladder near Temple Rafters"], + # in-line with the chest above dark tomb, gets you up the mountain stairs + "Group 8": ["Ladders near Patrol Cave", "Ladder near Temple Rafters", "Ladders near Dark Tomb"], } # ladders accessible within different regions, only those that are relevant region_ladders: Dict[str, List[str]] = { - "Overworld": ["Ladders in Overworld Town", "Ladder to Swamp", "Ladders near Weathervane", "Ladder to Quarry", - "Ladders in Well", "Ladders near Dark Tomb", "Ladders near Overworld Checkpoint", ], + "Overworld": ["Ladders near Weathervane", "Ladders near Overworld Checkpoint", "Ladders near Dark Tomb", + "Ladders in Overworld Town", "Ladder to Swamp", "Ladders in Well"], "Overworld Beach": ["Ladder to Ruined Atoll"], "Overworld at Patrol Cave": ["Ladders near Patrol Cave"], "Overworld Quarry Entry": ["Ladder to Quarry"], diff --git a/worlds/tunic/options.py b/worlds/tunic/options.py index aa7e88cbbe..7d9ca87388 100644 --- a/worlds/tunic/options.py +++ b/worlds/tunic/options.py @@ -205,11 +205,12 @@ class LadderStorage(Choice): """ Choose whether Ladder Storage is in logic. Easy includes uses of Ladder Storage to get to open doors over a long distance without too much difficulty. + May include convenient elevation changes (going up Mountain stairs, stairs in front of Special Shop, etc.). Medium includes the above as well as changing your elevation using the environment and getting knocked down by melee enemies mid-LS. Hard includes the above as well as going behind the map to enter closed doors from behind. - Tedious includes the above as well as opening individual chests mid-LS. Enabling any of these difficulty options will give the player the Torch item to return to the Overworld checkpoint to avoid softlocks. Checks that require you to get softlocked are not in logic. Needing to death warp or quit to menu to escape a situation is not considered a softlock. + Opening individual chests while doing ladder storage is excluded due to tedium. """ internal_name = "ladder_storage" display_name = "Ladder Storage Logic" @@ -217,7 +218,6 @@ class LadderStorage(Choice): option_easy = 1 option_medium = 2 option_hard = 3 - option_tedious = 4 default = 0