Fix Aga Lamp in swordless mode
Apply mode related rule changes before the no-glitches add-on rules.
This commit is contained in:
parent
9c6d649996
commit
8a981b5140
16
Rules.py
16
Rules.py
|
@ -4,13 +4,6 @@ import logging
|
||||||
def set_rules(world):
|
def set_rules(world):
|
||||||
global_rules(world)
|
global_rules(world)
|
||||||
|
|
||||||
if world.logic == 'noglitches':
|
|
||||||
no_glitches_rules(world)
|
|
||||||
elif world.logic == 'minorglitches':
|
|
||||||
logging.getLogger('').info('Minor Glitches may be buggy still. No guarantee for proper logic checks.')
|
|
||||||
else:
|
|
||||||
raise NotImplementedError('Not implemented yet')
|
|
||||||
|
|
||||||
if world.mode == 'open':
|
if world.mode == 'open':
|
||||||
open_rules(world)
|
open_rules(world)
|
||||||
elif world.mode == 'standard':
|
elif world.mode == 'standard':
|
||||||
|
@ -20,6 +13,15 @@ def set_rules(world):
|
||||||
else:
|
else:
|
||||||
raise NotImplementedError('Not implemented yet')
|
raise NotImplementedError('Not implemented yet')
|
||||||
|
|
||||||
|
if world.logic == 'noglitches':
|
||||||
|
no_glitches_rules(world)
|
||||||
|
elif world.logic == 'minorglitches':
|
||||||
|
logging.getLogger('').info('Minor Glitches may be buggy still. No guarantee for proper logic checks.')
|
||||||
|
else:
|
||||||
|
raise NotImplementedError('Not implemented yet')
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if world.goal == 'dungeons':
|
if world.goal == 'dungeons':
|
||||||
# require all dungeons to beat ganon
|
# require all dungeons to beat ganon
|
||||||
add_rule(world.get_location('Ganon'), lambda state: state.can_reach('Altar', 'Location') and state.has('Beat Agahnim 1') and state.has('Beat Agahnim 2'))
|
add_rule(world.get_location('Ganon'), lambda state: state.can_reach('Altar', 'Location') and state.has('Beat Agahnim 1') and state.has('Beat Agahnim 2'))
|
||||||
|
|
Loading…
Reference in New Issue