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

Inverted dungeonsfull fix - Force reusing an existing cave if there are not enough entrances to use a new one.

Browse Source
This commit is contained in:
compiling
2020-05-24 18:50:03 +10:00
parent cebd3bdd90
commit b558c054e9
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
EntranceShuffle.py
View File

@@ -1911,12 +1911,13 @@ def connect_mandatory_exits(world, entrances, caves, must_be_exits, player, dp_m
random.shuffle(entrances) random.shuffle(entrances)
random.shuffle(caves) random.shuffle(caves)
used_caves = [] used_caves = []
required_entrances = 0 # Number of entrances reserved for used_caves
while must_be_exits: while must_be_exits:
exit = must_be_exits.pop() exit = must_be_exits.pop()
# find multi exit cave # find multi exit cave
cave = None cave = None
for candidate in caves: for candidate in caves:
if not isinstance(candidate, str): if not isinstance(candidate, str) and (candidate in used_caves or len(candidate) < len(entrances) - required_entrances):
cave = candidate cave = candidate
break break
@@ -1941,6 +1942,11 @@ def connect_mandatory_exits(world, entrances, caves, must_be_exits, player, dp_m
for exit in cave[:-1]: for exit in cave[:-1]:
connect_two_way(world,entrances.pop(),exit, player) connect_two_way(world,entrances.pop(),exit, player)
else:#save for later so we can connect to multiple exits else:#save for later so we can connect to multiple exits
if cave in used_caves:
required_entrances -= 1
used_caves.remove(cave)
else:
required_entrances += len(cave)-1
caves.append(cave[0:-1]) caves.append(cave[0:-1])
random.shuffle(caves) random.shuffle(caves)
used_caves.append(cave[0:-1]) used_caves.append(cave[0:-1])