From e0bf8227fb327922524f98cbd3046169fcda23c6 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Wed, 12 Jul 2023 20:05:47 -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 2cd92599..16ba3eb8 100644 --- a/Rules.py +++ b/Rules.py @@ -26,18 +26,6 @@ def set_rules(world, player): if world.swords[player] == 'swordless': swordless_rules(world, player) - ow_bunny_rules(world, player) - ow_terrain_rules(world, player) - - if world.mode[player] == 'standard': - if not world.is_copied_world: - standard_rules(world, player) - else: - misc_key_rules(world, player) - - bomb_rules(world, player) - pot_rules(world, player) - if world.logic[player] == 'noglitches': no_glitches_rules(world, player) elif world.logic[player] == 'minorglitches': @@ -54,6 +42,18 @@ def set_rules(world, player): else: raise NotImplementedError('Not implemented yet') + ow_bunny_rules(world, player) + ow_terrain_rules(world, player) + + if world.mode[player] == 'standard': + if not world.is_copied_world: + standard_rules(world, player) + else: + misc_key_rules(world, player) + + bomb_rules(world, player) + pot_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_beaten_aga(player) and state.has('Beat Agahnim 2', player) and state.has_crystals(7, player))