morgan/Grinch-AP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Properly accounting for agatower not freely opening for dungeon reentry

Browse Source
This commit is contained in:
espeon65536
2021-06-08 18:17:21 -05:00
parent a73189338c
commit e0d90e0b21
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
worlds/alttp/UnderworldGlitchRules.py
View File

@@ -57,6 +57,8 @@ def underworld_glitches_rules(world, player):
set_rule(kikiskip, lambda state: False) set_rule(kikiskip, lambda state: False)
elif pod_entrance.name == 'Misery Mire': elif pod_entrance.name == 'Misery Mire':
add_rule(kikiskip, lambda state: state.has_sword(player) and state.has_misery_mire_medallion(player)) add_rule(kikiskip, lambda state: state.has_sword(player) and state.has_misery_mire_medallion(player))
elif pod_entrance.name == 'Agahnims Tower':
add_rule(kikiskip, lambda state: state.has('Cape', player) or state.has_beam_sword(player) or state.has('Beat Agahnim 1', player))
# Then we set a restriction on exiting the dungeon, so you can't leave unless you got in normally. # Then we set a restriction on exiting the dungeon, so you can't leave unless you got in normally.
add_rule(world.get_entrance('Palace of Darkness Exit', player), lambda state: pod_entrance.can_reach(state)) add_rule(world.get_entrance('Palace of Darkness Exit', player), lambda state: pod_entrance.can_reach(state))
@@ -111,12 +113,16 @@ def underworld_glitches_rules(world, player):
set_rule(mire_to_hera, lambda state: False) set_rule(mire_to_hera, lambda state: False)
elif hera_entrance.name == 'Misery Mire': elif hera_entrance.name == 'Misery Mire':
add_rule(mire_to_hera, lambda state: state.has_sword(player) and state.has_misery_mire_medallion(player)) add_rule(mire_to_hera, lambda state: state.has_sword(player) and state.has_misery_mire_medallion(player))
elif hera_entrance.name == 'Agahnims Tower':
add_rule(mire_to_hera, lambda state: state.has('Cape', player) or state.has_beam_sword(player) or state.has('Beat Agahnim 1', player))
add_rule(world.get_entrance('Tower of Hera Exit', player), lambda state: hera_entrance.can_reach(state)) add_rule(world.get_entrance('Tower of Hera Exit', player), lambda state: hera_entrance.can_reach(state))
if swamp_entrance.name == 'Skull Woods Final Section': if swamp_entrance.name == 'Skull Woods Final Section':
set_rule(mire_to_swamp, lambda state: False) set_rule(mire_to_swamp, lambda state: False)
elif swamp_entrance.name == 'Misery Mire': elif swamp_entrance.name == 'Misery Mire':
add_rule(mire_to_swamp, lambda state: state.has_sword(player) and state.has_misery_mire_medallion(player)) add_rule(mire_to_swamp, lambda state: state.has_sword(player) and state.has_misery_mire_medallion(player))
elif swamp_entrance.name == 'Agahnims Tower':
add_rule(mire_to_swamp, lambda state: state.has('Cape', player) or state.has_beam_sword(player) or state.has('Beat Agahnim 1', player))
add_rule(world.get_entrance('Swamp Palace Exit', player), lambda state: swamp_entrance.can_reach(state)) add_rule(world.get_entrance('Swamp Palace Exit', player), lambda state: swamp_entrance.can_reach(state))
elif not fix_fake_worlds: elif not fix_fake_worlds:
add_rule(mire_to_hera, lambda state: hera_entrance.access_rule(fake_pearl_state(state, player))) add_rule(mire_to_hera, lambda state: hera_entrance.access_rule(fake_pearl_state(state, player)))