From a76d7f7cfdb9253bc467afc13ba58d5c75c807f0 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Mon, 24 May 2021 04:08:28 -0500 Subject: [PATCH] Fixed Standard generation --- DoorShuffle.py | 2 ++ Rules.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/DoorShuffle.py b/DoorShuffle.py index 4cefb1fc..2c5c133b 100644 --- a/DoorShuffle.py +++ b/DoorShuffle.py @@ -1864,6 +1864,8 @@ def find_accessible_entrances(world, player, builder): connect = ext.connected_region if connect is None or ext.door and ext.door.blocked: continue + if world.mode[player] == 'standard' and builder.name == 'Hyrule Castle' and ext.name in ['Hyrule Castle Main Gate (North)', 'Top of Pyramid (Inner)', 'Inverted Pyramid Entrance' ]: + continue if connect.name in entrances and connect not in visited_entrances: visited_entrances.append(connect.name) elif connect and connect not in queue and connect not in visited_regions: diff --git a/Rules.py b/Rules.py index a84f4f20..c6ee08a0 100644 --- a/Rules.py +++ b/Rules.py @@ -1570,7 +1570,7 @@ def standard_rules(world, player): set_rule(entrance, lambda state: state.has('Zelda Delivered', player)) set_rule(world.get_entrance('Sanctuary Exit', player), lambda state: state.has('Zelda Delivered', player)) # zelda should be saved before agahnim is in play - set_rule(world.get_location('Agahnim 1', player), lambda state: state.has('Zelda Delivered', player)) + add_rule(world.get_location('Agahnim 1', player), lambda state: state.has('Zelda Delivered', player)) # too restrictive for crossed? def uncle_item_rule(item):