Merge branch 'DoorDevUnstable' into OverworldShuffleDev

2023-08-07 17:59:22 -05:00
parent fd3bdc6b71 a4d5dec8ad
commit 541dbbd9e5
2 changed files with 13 additions and 12 deletions
--- a/DoorShuffle.py
+++ b/DoorShuffle.py
@@ -2230,6 +2230,7 @@ def find_valid_trap_combination(builder, suggested, start_regions, paths, world,
            itr = 0
        proposal = kth_combination(sample_list[itr], trap_door_pool, trap_doors_needed)
        proposal.extend(custom_trap_doors)
+        filtered_proposal = [x for x in proposal if x.name not in trap_door_exceptions]
    builder.trap_door_proposal = proposal
    return proposal, trap_doors_needed