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

Final fixes and reorganization to Inverted Region merging

Browse Source
This commit is contained in:
codemann8
2022-12-16 18:20:14 -06:00
parent 55a91f8d17
commit 6240061a65
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
KeyDoorShuffle.py
View File

@@ -1406,7 +1406,7 @@ def forced_big_key_avail(locations):
def prize_relevance(key_layout, dungeon_entrance, is_atgt_swapped): def prize_relevance(key_layout, dungeon_entrance, is_atgt_swapped):
if len(key_layout.start_regions) > 1 and dungeon_entrance and dungeon_table[key_layout.key_logic.dungeon].prize: if len(key_layout.start_regions) > 1 and dungeon_entrance and dungeon_table[key_layout.key_logic.dungeon].prize:
if dungeon_entrance.name == 'Agahnims Tower' if is_atgt_swapped else 'Ganons Tower': if dungeon_entrance.name == ('Agahnims Tower' if is_atgt_swapped else 'Ganons Tower'):
return 'GT' return 'GT'
elif dungeon_entrance.name == 'Pyramid Fairy': elif dungeon_entrance.name == 'Pyramid Fairy':
return 'BigBomb' return 'BigBomb'
@@ -1415,7 +1415,7 @@ def prize_relevance(key_layout, dungeon_entrance, is_atgt_swapped):
def prize_relevance_sig2(start_regions, d_name, dungeon_entrance, is_atgt_swapped): def prize_relevance_sig2(start_regions, d_name, dungeon_entrance, is_atgt_swapped):
if len(start_regions) > 1 and dungeon_entrance and dungeon_table[d_name].prize: if len(start_regions) > 1 and dungeon_entrance and dungeon_table[d_name].prize:
if dungeon_entrance.name == 'Agahnims Tower' if is_atgt_swapped else 'Ganons Tower': if dungeon_entrance.name == ('Agahnims Tower' if is_atgt_swapped else 'Ganons Tower'):
return 'GT' return 'GT'
elif dungeon_entrance.name == 'Pyramid Fairy': elif dungeon_entrance.name == 'Pyramid Fairy':
return 'BigBomb' return 'BigBomb'

1
source/overworld/EntranceShuffle2.py
View File

@@ -1572,7 +1572,6 @@ entrance_map = {
'Paradox Cave (Bottom)': 'Paradox Cave Exit (Bottom)', 'Paradox Cave (Bottom)': 'Paradox Cave Exit (Bottom)',
'Paradox Cave (Middle)': 'Paradox Cave Exit (Middle)', 'Paradox Cave (Middle)': 'Paradox Cave Exit (Middle)',
'Paradox Cave (Top)': 'Paradox Cave Exit (Top)', 'Paradox Cave (Top)': 'Paradox Cave Exit (Top)',
'Inverted Dark Sanctuary': 'Inverted Dark Sanctuary Exit',
} }