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

Fixed Swapped ER to prevent Old Man from being unretunable

Browse Source
This commit is contained in:
codemann8
2023-08-17 07:04:06 -05:00
parent 541dbbd9e5
commit ed9585eef6
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/overworld/EntranceShuffle2.py
View File

@@ -265,9 +265,14 @@ def do_main_shuffle(entrances, exits, avail, mode_def):
else: else:
# cross world mandantory # cross world mandantory
entrance_list = list(entrances) entrance_list = list(entrances)
if avail.swapped:
forbidden = [e for e in Forbidden_Swap_Entrances if e in entrance_list]
entrance_list = [e for e in entrance_list if e not in forbidden]
must_exit, multi_exit_caves = figure_out_must_exits_cross_world(entrances, exits, avail) must_exit, multi_exit_caves = figure_out_must_exits_cross_world(entrances, exits, avail)
do_mandatory_connections(avail, entrance_list, multi_exit_caves, must_exit) do_mandatory_connections(avail, entrance_list, multi_exit_caves, must_exit)
rem_entrances.update(entrance_list) rem_entrances.update(entrance_list)
if avail.swapped:
rem_entrances.update(forbidden)
rem_exits.update([x for item in multi_exit_caves for x in item if x in avail.exits]) rem_exits.update([x for item in multi_exit_caves for x in item if x in avail.exits])
rem_exits.update(exits) rem_exits.update(exits)