From a8a12d14bafacfd5e678e9f663cdd55386d4d2d1 Mon Sep 17 00:00:00 2001 From: qadan Date: Sun, 9 Feb 2020 13:54:59 -0400 Subject: [PATCH] wip stuff --- OWGSets.py | 2 +- Rules.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/OWGSets.py b/OWGSets.py index 258d830d..743c24a8 100644 --- a/OWGSets.py +++ b/OWGSets.py @@ -159,7 +159,6 @@ def get_dmd_and_bunny_regions(): return [ 'West Dark World', 'South Dark World', - 'Northeast Dark World', ] @@ -170,6 +169,7 @@ def get_dmd_non_bunny_regions(): return [ 'Dark Desert', 'East Dark World', + 'Northeast Dark World', ] diff --git a/Rules.py b/Rules.py index d812b2fc..5c2225e2 100644 --- a/Rules.py +++ b/Rules.py @@ -740,7 +740,7 @@ def overworld_glitches_rules(world, player): # Boots-accessible regions due to DMD. if world.mode[player] != 'inverted': # DMD with and without bunny. - can_bunny_dmd = lambda state: world.get_region('Death Mountain').can_reach(state, player) and state.has_Mirror(player) + can_bunny_dmd = lambda state: state.has_Mirror(player) for dmd_bunny_region in OWGSets.get_dmd_and_bunny_regions(): region = world.get_region(dmd_bunny_region, player) region.can_reach_private = lambda state: region.can_reach(state) or (needs_boots_and_pearl or can_bunny_dmd) @@ -781,7 +781,6 @@ def overworld_glitches_rules(world, player): set_rule(world.get_location('Bombos Tablet', player), lambda state: state.has('Book of Mudora', player) and state.has_beam_sword(player) and (state.has_Mirror(player) or state.has_Boots(player))) set_rule(world.get_location('Ether Tablet', player), lambda state: state.has('Book of Mudora', player) and state.has_beam_sword(player) and (state.has_Mirror(player) or state.has_Boots(player))) set_rule(world.get_entrance('Dark Desert Teleporter', player), lambda state: state.has('Ocarina', player) or (state.has_Boots(player) and state.can_lift_heavy_rocks(player))) - set_rule(world.get_location('Zora\'s Ledge', player), lambda state: state.has_Boots(player)) add_rule(world.get_entrance('Ganons Tower', player), lambda state: state.has_Boots(player) and state.has_Pearl(player), 'or') add_rule(world.get_entrance('East Death Mountain Teleporter', player), lambda state: state.can_lift_heavy_rocks(player) and state.has_Boots(player), 'or') add_rule(world.get_entrance('Turtle Rock Teleporter', player), lambda state: state.has_Boots(player) and state.has('Hammer', player), 'or')