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

Fixed some errors, properly junk filling entrances in Simple ER

Browse Source
This commit is contained in:
codemann8
2021-10-15 20:02:42 -05:00
parent 62e925d589
commit f958e2a3ea
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
EntranceShuffle.py
View File

@@ -620,7 +620,7 @@ def connect_exit(world, exitname, entrancename, player, mark_two_way=True):
if not (ignore_pool or exitname == 'Chris Houlihan Room Exit'): if not (ignore_pool or exitname == 'Chris Houlihan Room Exit'):
if mark_two_way: if mark_two_way:
entrance_pool.remove(entrancename) entrance_pool.remove(entrancename)
else: elif world.shuffle[player] == 'insanity':
entrance_exits.append(entrancename) entrance_exits.append(entrancename)
exit_pool.remove(exitname) exit_pool.remove(exitname)
@@ -649,7 +649,8 @@ def connect_two_way(world, entrancename, exitname, player):
if not ignore_pool: if not ignore_pool:
entrance_pool.remove(entrancename) entrance_pool.remove(entrancename)
exit_pool.remove(exitname) exit_pool.remove(exitname)
entrance_exits.append(entrancename) if world.shuffle[player] == 'insanity':
entrance_exits.append(entrancename)
if not suppress_spoiler: if not suppress_spoiler:
world.spoiler.set_entrance(entrance.name, exit.name, 'both', player) world.spoiler.set_entrance(entrance.name, exit.name, 'both', player)
@@ -1343,7 +1344,11 @@ def junk_fill_inaccessible(world, player):
for exit in region.exits: for exit in region.exits:
if not exit.connected_region and exit.name in entrance_pool: if not exit.connected_region and exit.name in entrance_pool:
inaccessible_entrances.append(exit.name) inaccessible_entrances.append(exit.name)
#TODO: assign non-item locations to the entrances that exist in the unreachable regions
junk_locations = [e for e in list(zip(*default_connections))[1] if e in exit_pool]
random.shuffle(junk_locations)
for entrance in inaccessible_entrances:
connect_entrance(world, entrance, junk_locations.pop(), player)
def connect_inaccessible_regions(world, lw_entrances, dw_entrances, caves, player): def connect_inaccessible_regions(world, lw_entrances, dw_entrances, caves, player):