Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow reverse overworld entrances to be used in plando with full mixed pools #53

Merged
merged 2 commits into from
Aug 11, 2021
Merged

Allow reverse overworld entrances to be used in plando with full mixed pools #53

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3629ca
allow reverse OW entrances to be used in plando with mixed pools
mracsys Jul 24, 2021
0973c8d
fix regression with decoupled entrances
mracsys Jul 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions Plandomizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,24 +531,37 @@ def set_shuffled_entrances(self, worlds, entrance_pools, target_entrance_pools,
entrance_found = False
for pool_type, entrance_pool in entrance_pools.items():
try:
matched_entrance = next(filter(lambda entrance: entrance.name == name, entrance_pool))
matched_entrance = next(filter(lambda entrance: (entrance.name == name or (entrance.reverse and entrance.reverse.name == name and not worlds[self.id].decouple_entrances)), entrance_pool))
except StopIteration:
continue

if matched_entrance.type == 'Overworld' and matched_entrance.name != name:
reverse_entrance = matched_entrance
matched_entrance = matched_entrance.reverse
matched_entrance.reverse = reverse_entrance

entrance_found = True
if matched_entrance.connected_region != None:
if matched_entrance.type == 'Overworld':
if matched_entrance.type == 'Overworld' or (pool_type == 'Mixed' and matched_entrance.replaces.type == 'Overworld'):
continue
else:
raise RuntimeError('Entrance already shuffled in world %d: %s' % (self.id + 1, name))

target_region = record.region

matched_targets_to_region = list(filter(lambda target: target.connected_region and target.connected_region.name == target_region,

matched_targets_to_region = list(filter(lambda target: (target.connected_region and target.connected_region.name == target_region)
or (target.reverse and target.reverse.connected_region and target.reverse.connected_region.name == target_region and not worlds[self.id].decouple_entrances),
target_entrance_pools[pool_type]))
if not matched_targets_to_region:
raise RuntimeError('No entrance found to replace with %s that leads to %s in world %d' %
(matched_entrance, target_region, self.id + 1))
index = 0
while index < len(matched_targets_to_region):
if (matched_targets_to_region[index].connected_region and matched_targets_to_region[index].connected_region.name != target_region) or (matched_targets_to_region[index].connected_region is None):
reverse_target = matched_targets_to_region[index]
matched_targets_to_region[index] = matched_targets_to_region[index].reverse
matched_targets_to_region[index].reverse = reverse_target
index += 1

if record.origin:
target_parent = record.origin
Expand Down