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

Added Customizer support for OWR Layout and Whirlpool Shuffle

Browse Source
This commit is contained in:
codemann8
2023-08-27 08:19:02 -05:00
parent 59d446aac2
commit 179e605253
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OverworldShuffle.py
View File

@@ -326,8 +326,10 @@ def link_overworld(world, player):
whirlpools.remove(whirl1) whirlpools.remove(whirl1)
whirlpools.remove(whirl2) whirlpools.remove(whirl2)
connect_whirlpool(whirl1, whirl2) connect_whirlpool(whirl1, whirl2)
elif whirl1 != whirl2 or not any(w for w in connected_whirlpools if (whirlname1 in w) and (whirlname2 in w)): elif whirl1 != whirl2:
raise GenerationException('Attempting to connect whirlpools not in same pool: \'%s\' <-> \'%s\'', whirl1, whirl2) raise GenerationException('Attempting to connect whirlpools not in same pool: \'%s\' <-> \'%s\'', whirlname1, whirlname2)
elif any(w for w in connected_whirlpools if (whirlname1 in w) != (whirlname2 in w)):
raise GenerationException('Attempting to connect whirlpools already connected: \'%s\' <-> \'%s\'', whirlname1, whirlname2)
for whirlpools in whirlpool_candidates: for whirlpools in whirlpool_candidates:
random.shuffle(whirlpools) random.shuffle(whirlpools)
while len(whirlpools): while len(whirlpools):