diff --git a/OWEdges.py b/OWEdges.py index 3eb17751..82b4fd0c 100644 --- a/OWEdges.py +++ b/OWEdges.py @@ -664,19 +664,25 @@ OWEdgeGroups = { OWTileGroups = { ("Woods", "Regular"): ( [ - 0x00, 0x40, 0x80 + 0x00, 0x2d, 0x40, 0x6d, 0x80 ], [ 'Master Sword Meadow', 'Lost Woods West Area', - 'Lost Woods East Area' + 'Lost Woods East Area', + 'Stone Bridge Area', + 'Stone Bridge Water', + 'Hobo Bridge' ], [ 'Skull Woods Forest', 'Skull Woods Portal Entry', 'Skull Woods Forest (West)', 'Skull Woods Forgotten Path (Southwest)', - 'Skull Woods Forgotten Path (Northeast)' + 'Skull Woods Forgotten Path (Northeast)', + 'Hammer Bridge North Area', + 'Hammer Bridge South Area', + 'Hammer Bridge Water' ] ), ("Lumberjack", "Regular"): ( @@ -1021,21 +1027,6 @@ OWTileGroups = { # 'Big Bomb Shop Area' # ] # ), - ("Bridge", "Regular"): ( - [ - 0x2d, 0x6d, 0x80 - ], - [ - 'Stone Bridge Area', - 'Stone Bridge Water', - 'Hobo Bridge' - ], - [ - 'Hammer Bridge North Area', - 'Hammer Bridge South Area', - 'Hammer Bridge Water' - ] - ), ("Tree Line", "Regular"): ( [ 0x2e, 0x6e diff --git a/OverworldShuffle.py b/OverworldShuffle.py index e4039faf..e4819c92 100644 --- a/OverworldShuffle.py +++ b/OverworldShuffle.py @@ -56,10 +56,6 @@ def link_overworld(world, player): exist_dw_regions.extend(dw_regions) world.owswaps[player] = [exist_owids, exist_lw_regions, exist_dw_regions] - #dont perform moon pearl check unless both hobo and ped are swapped - if 0x80 in world.owswaps[player][0]: - world.owswaps[player][0].remove(0x80) - #replace LW edges with DW ignore_list = list() #TODO: Remove ignore_list when special OW areas are included in pool for edgeset in temporary_mandatory_connections: @@ -189,8 +185,6 @@ def link_overworld(world, player): # layout shuffle if world.owShuffle[player] == 'vanilla': - #for exitname, destname in default_connections: - # connect_two_way(world, exitname, destname, player) for grouping in (trimmed_groups,): groups = list(trimmed_groups.values()) for (forward_edge_sets, back_edge_sets) in groups: