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

Fixed some wrong ER code in Insanity

Browse Source
This commit is contained in:
codemann8
2021-06-29 03:30:57 -05:00
parent 170d18191c
commit 7379f7c7d9
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
EntranceShuffle.py
View File

@@ -1400,7 +1400,6 @@ def link_entrances(world, player):
caves.append(('Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)')) caves.append(('Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)'))
else: else:
doors.append('Hyrule Castle Entrance (South)') doors.append('Hyrule Castle Entrance (South)')
entrances.append('Hyrule Castle Entrance (South)')
caves.append(('Hyrule Castle Exit (South)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)')) caves.append(('Hyrule Castle Exit (South)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)'))
if not world.shufflelinks[player]: if not world.shufflelinks[player]:
@@ -1420,7 +1419,7 @@ def link_entrances(world, player):
exit_pool.remove(links_house) exit_pool.remove(links_house)
if not invFlag: if not invFlag:
sanc_doors = [door for door in Sanctuary_Doors if door in exit_pool] sanc_doors = [door for door in exit_pool] #[door for door in Sanctuary_Doors if door in exit_pool]
else: else:
sanc_doors = [door for door in Inverted_Dark_Sanctuary_Doors if door in exit_pool] sanc_doors = [door for door in Inverted_Dark_Sanctuary_Doors if door in exit_pool]
sanc_door = random.choice(sanc_doors) sanc_door = random.choice(sanc_doors)
@@ -1472,17 +1471,7 @@ def link_entrances(world, player):
connect_entrance(world, doors.pop(), 'Old Man Cave Exit (East)', player) connect_entrance(world, doors.pop(), 'Old Man Cave Exit (East)', player)
caves.append('Old Man Cave Exit (West)') caves.append('Old Man Cave Exit (West)')
# handle remaining caves
for cave in caves:
if isinstance(cave, str):
cave = (cave,)
for exit in cave:
connect_exit(world, exit, entrances.pop(), player)
connect_entrance(world, doors.pop(), exit, player)
# handle simple doors # handle simple doors
single_doors = list(Single_Cave_Doors) single_doors = list(Single_Cave_Doors)
bomb_shop_doors = list(Bomb_Shop_Single_Cave_Doors) bomb_shop_doors = list(Bomb_Shop_Single_Cave_Doors)
blacksmith_doors = list(Blacksmith_Single_Cave_Doors) blacksmith_doors = list(Blacksmith_Single_Cave_Doors)