Fixed issue with flipper rules not getting pearl rules added
This commit is contained in:
24
Rules.py
24
Rules.py
@@ -31,18 +31,6 @@ def set_rules(world, player):
|
|||||||
if world.swords[player] == 'swordless':
|
if world.swords[player] == 'swordless':
|
||||||
swordless_rules(world, player)
|
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':
|
if world.logic[player] == 'noglitches':
|
||||||
no_glitches_rules(world, player)
|
no_glitches_rules(world, player)
|
||||||
elif world.logic[player] == 'minorglitches':
|
elif world.logic[player] == 'minorglitches':
|
||||||
@@ -59,6 +47,18 @@ def set_rules(world, player):
|
|||||||
else:
|
else:
|
||||||
raise NotImplementedError('Not implemented yet')
|
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':
|
if world.goal[player] == 'dungeons':
|
||||||
# require all dungeons to beat ganon
|
# 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))
|
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))
|
||||||
|
|||||||
Reference in New Issue
Block a user