From affd7568cb47ba33b10ab1ef68040045d8e516e4 Mon Sep 17 00:00:00 2001 From: aerinon Date: Thu, 9 Mar 2023 16:48:14 -0700 Subject: [PATCH] Minor adjustments to world model refactor --- Main.py | 1 - Rules.py | 9 ++++----- source/overworld/EntranceShuffle2.py | 1 - 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Main.py b/Main.py index cda30701..e624c1fd 100644 --- a/Main.py +++ b/Main.py @@ -241,7 +241,6 @@ def main(args, seed=None, fish=None): for player in range(1, world.players + 1): set_rules(world, player) - reg = world.get_region('Dark Desert', 1) district_item_pool_config(world) for player in range(1, world.players + 1): if world.shopsanity[player]: diff --git a/Rules.py b/Rules.py index cfb79894..05364af8 100644 --- a/Rules.py +++ b/Rules.py @@ -246,6 +246,10 @@ def global_rules(world, player): set_rule(world.get_entrance('Hammer Bridge Pegs (North)', player), lambda state: state.has('Hammer', player)) set_rule(world.get_entrance('Hammer Bridge Pegs (South)', player), lambda state: state.has('Hammer', player)) + # this more like an ohko rule - dependent on bird being present too - so enemizer could turn this off? + set_rule(world.get_entrance('Bumper Cave Ledge Drop', player), lambda state: state.has_Pearl(player) and + (state.has('Cape', player) or state.has('Cane of Byrna', player) or state.has_sword(player))) + # entrance rules # Caution: If king's grave is relaxed at all to account for reaching it via a two way cave's exit in insanity mode, then the bomb shop logic will need to be updated (that would involve create a small ledge-like Region for it) # TODO: Not sure if this ^ is true anymore since Kings Grave is its own region now @@ -900,11 +904,6 @@ def ow_inverted_rules(world, player): or (state.can_reach('Light World', 'Region', player) and state.has_Mirror(player))) # Need LW access using Mirror or Portal set_rule(world.get_entrance('Inverted Pyramid Hole', player), lambda state: world.open_pyramid[player] or world.goal[player] == 'trinity' or state.has('Beat Agahnim 2', player)) - # todo: this needs a new home - # # this more like an ohko rule - dependent on bird being present too - so enemizer could turn this off? - # set_rule(world.get_entrance('Bumper Cave Ledge Drop', player), lambda state: state.has_Pearl(player) and - # (state.has('Cape', player) or state.has('Cane of Byrna', player) or state.has_sword(player))) - def ow_bunny_rules(world, player): # locations diff --git a/source/overworld/EntranceShuffle2.py b/source/overworld/EntranceShuffle2.py index c2b3d71b..dfed84c6 100644 --- a/source/overworld/EntranceShuffle2.py +++ b/source/overworld/EntranceShuffle2.py @@ -976,7 +976,6 @@ def find_entrances_and_exits(avail_pool, entrance_pool): inverted_sub_table = { - #TODO: Confirm this is correct #'Ganons Tower': 'Agahnims Tower', #'Agahnims Tower': 'Ganons Tower', #'Links House': 'Big Bomb Shop',