alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Changed GT/AT swap in Mixed OW to prioritize leaving AT vanilla unless GT is the only one in the starting world

Browse Source
This commit is contained in:
codemann8
2022-02-03 06:12:18 -06:00
parent 7e7efb0533
commit 392cb7187c
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Rules.py
View File

@@ -854,8 +854,7 @@ def default_rules(world, player):
def ow_rules(world, player):
if (0x03 in world.owswaps[player][0]) == (0x1b in world.owswaps[player][0]) and \
(0x03 not in world.owswaps[player][0]) == world.mode[player] == 'inverted':
if (0x03 in world.owswaps[player][0]) == (0x1b in world.owswaps[player][0]) == (world.mode[player] != 'inverted'):
set_rule(world.get_entrance('Agahnims Tower', player), lambda state: state.has_crystals(world.crystals_needed_for_gt[player], player))
else:
set_rule(world.get_entrance('Agahnims Tower', player), lambda state: state.has('Cape', player) or state.has_beam_sword(player) or state.has('Beat Agahnim 1', player)) # barrier gets removed after killing agahnim, relevant for entrance shuffle
@@ -1525,8 +1524,7 @@ def swordless_rules(world, player):
set_rule(world.get_location('Ganon', player), lambda state: state.has('Hammer', player) and state.has_fire_source(player) and state.has('Silver Arrows', player) and state.can_shoot_arrows(player) and state.has_crystals(world.crystals_needed_for_ganon[player], player))
set_rule(world.get_entrance('Ganon Drop', player), lambda state: state.has('Hammer', player)) # need to damage ganon to get tiles to drop
if not ((0x03 in world.owswaps[player][0]) == (0x1b in world.owswaps[player][0]) and \
(0x03 not in world.owswaps[player][0]) == world.mode[player] == 'inverted'):
if not ((0x03 in world.owswaps[player][0]) == (0x1b in world.owswaps[player][0]) == (world.mode[player] != 'inverted')):
set_rule(world.get_entrance('Agahnims Tower', player), lambda state: state.has('Cape', player) or state.has('Hammer', player) or state.has('Beat Agahnim 1', player)) # barrier gets removed after killing agahnim, relevant for entrance shuffle
set_rule(world.get_entrance('Misery Mire', player), lambda state: state.has_misery_mire_medallion(player)) # sword not required to use medallion for opening in swordless (!)