From 4246439c6120fad5b17ed79277d6f8dd3bb4c37f Mon Sep 17 00:00:00 2001 From: codemann8 Date: Mon, 17 Jul 2023 00:10:15 -0500 Subject: [PATCH] Fixed issue with flipper rules not getting pearl rules added --- Rules.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Rules.py b/Rules.py index 317a99c7..136c433d 100644 --- a/Rules.py +++ b/Rules.py @@ -31,18 +31,6 @@ def set_rules(world, player): if world.swords[player] == 'swordless': swordless_rules(world, player) - ow_bunny_rules(world, player) - - if world.mode[player] == 'standard': - standard_rules(world, player) - else: - misc_key_rules(world, player) - - bomb_rules(world, player) - pot_rules(world, player) - drop_rules(world, player) - challenge_room_rules(world, player) - if world.logic[player] == 'noglitches': no_glitches_rules(world, player) elif world.logic[player] == 'minorglitches': @@ -59,6 +47,18 @@ def set_rules(world, player): else: raise NotImplementedError('Not implemented yet') + ow_bunny_rules(world, player) + + if world.mode[player] == 'standard': + standard_rules(world, player) + else: + misc_key_rules(world, player) + + bomb_rules(world, player) + pot_rules(world, player) + drop_rules(world, player) + challenge_room_rules(world, player) + if world.goal[player] == 'dungeons': # require all dungeons to beat ganon add_rule(world.get_location('Ganon', player), lambda state: state.can_reach('Master Sword Pedestal', 'Location', player) and state.has('Beat Agahnim 1', player) and state.has('Beat Agahnim 2', player) and state.has_crystals(7, player))