From 430953d3400082114b80979380c953feb4b0184b Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sat, 15 Jan 2022 12:24:44 -0600 Subject: [PATCH] Removed ladder from DDM --- OWEdges.py | 2 -- OverworldShuffle.py | 2 -- Regions.py | 4 ++-- Rom.py | 2 +- data/base2current.bps | Bin 87435 -> 87400 bytes 5 files changed, 3 insertions(+), 7 deletions(-) diff --git a/OWEdges.py b/OWEdges.py index d4f5f8a1..ec4d8b05 100644 --- a/OWEdges.py +++ b/OWEdges.py @@ -1590,9 +1590,7 @@ OWExitTypes = { 'Skull Woods Forgotten Bush (West)', 'Skull Woods Forgotten Bush (East)', 'GT Entry Approach', - 'Dark Death Mountain Ladder (North)', 'GT Entry Leave', - 'Dark Death Mountain Ladder (South)', 'Bumper Cave Entrance Rock', 'Skull Woods Pass Bush Row (West)', 'Skull Woods Pass Bush Row (East)', diff --git a/OverworldShuffle.py b/OverworldShuffle.py index 7f18f8c1..b4368ae1 100644 --- a/OverworldShuffle.py +++ b/OverworldShuffle.py @@ -1385,8 +1385,6 @@ ow_connections = { ], [ ('Spectacle Rock Leave', 'West Death Mountain (Top)'), ('Spectacle Rock Approach', 'Spectacle Rock Ledge'), - ('Dark Death Mountain Ladder (North)', 'West Dark Death Mountain (Bottom)'), - ('Dark Death Mountain Ladder (South)', 'West Dark Death Mountain (Top)'), ('West Dark Death Mountain (Top) Mirror Spot', 'West Dark Death Mountain (Top)'), ('Bubble Boy Mirror Spot', 'West Dark Death Mountain (Bottom)'), ('West Dark Death Mountain (Bottom) Mirror Spot', 'West Dark Death Mountain (Bottom)'), diff --git a/Regions.py b/Regions.py index 47864ca1..dc4df9d9 100644 --- a/Regions.py +++ b/Regions.py @@ -129,9 +129,9 @@ def create_regions(world, player): create_dw_region(player, 'Skull Woods Forgotten Path (Southwest)', None, ['Skull Woods Forgotten Bush (West)', 'Lost Woods Southwest Mirror Spot', 'Skull Woods SW']), create_dw_region(player, 'Skull Woods Forgotten Path (Northeast)', None, ['Skull Woods Forgotten Bush (East)', 'Lost Woods East (Forgotten) Mirror Spot', 'Lost Woods West (Forgotten) Mirror Spot', 'Skull Woods EN']), create_dw_region(player, 'Dark Lumberjack Area', None, ['Dark World Lumberjack Shop', 'Lumberjack Mirror Spot', 'Dark Lumberjack WN', 'Dark Lumberjack SW']), - create_dw_region(player, 'West Dark Death Mountain (Top)', None, ['Dark Death Mountain Drop (West)', 'GT Entry Approach', 'Dark Death Mountain Ladder (North)', 'West Death Mountain (Top) Mirror Spot', 'West Dark Death Mountain EN']), + create_dw_region(player, 'West Dark Death Mountain (Top)', None, ['Dark Death Mountain Drop (West)', 'GT Entry Approach', 'West Death Mountain (Top) Mirror Spot', 'West Dark Death Mountain EN']), create_dw_region(player, 'GT Approach', None, ['GT Entry Leave', 'Ganons Tower']), - create_dw_region(player, 'West Dark Death Mountain (Bottom)', None, ['Dark Death Mountain Ladder (South)', 'Spike Cave', 'Dark Death Mountain Fairy', 'Dark Death Mountain Teleporter (West)', 'Spectacle Rock Mirror Spot', 'West Dark Death Mountain ES']), + create_dw_region(player, 'West Dark Death Mountain (Bottom)', None, ['Spike Cave', 'Dark Death Mountain Fairy', 'Dark Death Mountain Teleporter (West)', 'Spectacle Rock Mirror Spot', 'West Dark Death Mountain ES']), create_dw_region(player, 'East Dark Death Mountain (Top)', None, ['Dark Death Mountain Drop (East)', 'Superbunny Cave (Top)', 'Hookshot Cave', 'East Death Mountain (Top West) Mirror Spot', 'East Death Mountain (Top East) Mirror Spot', 'East Dark Death Mountain WN', 'East Dark Death Mountain EN']), create_dw_region(player, 'East Dark Death Mountain (Bottom)', None, ['Superbunny Cave (Bottom)', 'Cave Shop (Dark Death Mountain)', 'Dark Death Mountain Teleporter (East)', 'Fairy Ascension Mirror Spot']), create_dw_region(player, 'East Dark Death Mountain (Bottom Left)', None, ['Death Mountain Bridge Mirror Spot', 'East Dark Death Mountain WS']), diff --git a/Rom.py b/Rom.py index d6bf0452..6b73d46f 100644 --- a/Rom.py +++ b/Rom.py @@ -33,7 +33,7 @@ from source.classes.SFX import randomize_sfx JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '2fe9f5776fa383e419e6feb779e583b5' +RANDOMIZERBASEHASH = 'd2aecda46578746112f5349645924c53' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 0c5a26337ffe2b7220ebcf7428810a2012d8952b..e95eded1906f1eea7f2c240c5e9039910514c7e2 100644 GIT binary patch delta 2709 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 QK_ma2DI7dJF>n9>01A)@LjV8(