monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix swordless vanilla shuffle TR keys issue

This commit is contained in:
cassidoxa 2019-09-11 14:24:56 -04:00 committed by Kevin Cathcart
parent ec865e67e6
commit 99a4ea17b0
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Rules.py
View File

@ -33,9 +33,6 @@ def set_rules(world, player):
else: else:
raise NotImplementedError('Not implemented yet') raise NotImplementedError('Not implemented yet')
if world.swords == 'swordless':
swordless_rules(world, player)
if world.logic == 'noglitches': if world.logic == 'noglitches':
no_glitches_rules(world, player) no_glitches_rules(world, player)
elif world.logic == 'minorglitches': elif world.logic == 'minorglitches':
@ -457,6 +454,9 @@ def global_rules(world, player):
set_rule(world.get_entrance('Ganons Tower', player), lambda state: False) # This is a safety for the TR function below to not require GT entrance in its key logic. set_rule(world.get_entrance('Ganons Tower', player), lambda state: False) # This is a safety for the TR function below to not require GT entrance in its key logic.
if world.swords == 'swordless':
swordless_rules(world, player)
set_trock_key_rules(world, player) set_trock_key_rules(world, player)
set_rule(world.get_entrance('Ganons Tower', player), lambda state: state.has_crystals(world.crystals_needed_for_gt, player)) set_rule(world.get_entrance('Ganons Tower', player), lambda state: state.has_crystals(world.crystals_needed_for_gt, player))
@ -843,6 +843,9 @@ def inverted_rules(world, player):
set_rule(world.get_entrance('Inverted Ganons Tower', player), lambda state: False) # This is a safety for the TR function below to not require GT entrance in its key logic. set_rule(world.get_entrance('Inverted Ganons Tower', player), lambda state: False) # This is a safety for the TR function below to not require GT entrance in its key logic.
if world.swords == 'swordless':
swordless_rules(world, player)
set_trock_key_rules(world, player) set_trock_key_rules(world, player)
set_rule(world.get_entrance('Inverted Ganons Tower', player), lambda state: state.has_crystals(world.crystals_needed_for_gt, player)) set_rule(world.get_entrance('Inverted Ganons Tower', player), lambda state: state.has_crystals(world.crystals_needed_for_gt, player))