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

Removed possibility to not remove flute spot from pool when chosen

Browse Source
This commit is contained in:
codemann8
2021-07-18 21:55:27 -05:00
parent 4c1412f2de
commit 9611d0757c
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OverworldShuffle.py
View File

@@ -229,7 +229,7 @@ def link_overworld(world, player):
new_spots = list() new_spots = list()
ignored_regions = set() ignored_regions = set()
def addSpot(owid, removeFromPool = False): def addSpot(owid):
if world.owFluteShuffle[player] == 'balanced': if world.owFluteShuffle[player] == 'balanced':
def getIgnored(regionname, base_owid, owid): def getIgnored(regionname, base_owid, owid):
region = world.get_region(regionname, player) region = world.get_region(regionname, player)
@@ -252,18 +252,17 @@ def link_overworld(world, player):
if random.randint(0, 31) != 0 and new_ignored.intersection(ignored_regions): if random.randint(0, 31) != 0 and new_ignored.intersection(ignored_regions):
return False return False
ignored_regions.update(new_ignored) ignored_regions.update(new_ignored)
if removeFromPool: flute_pool.remove(owid)
flute_pool.remove(owid)
new_spots.append(owid) new_spots.append(owid)
return True return True
# guarantee desert/mire access # guarantee desert/mire access
addSpot(0x38, True) addSpot(0x38)
# guarantee mountain access # guarantee mountain access
if world.owShuffle[player] == 'vanilla': if world.owShuffle[player] == 'vanilla':
mountainIds = [0x0b, 0x0e, 0x07] mountainIds = [0x0b, 0x0e, 0x07]
addSpot(mountainIds[random.randint(0, 2)], True) addSpot(mountainIds[random.randint(0, 2)])
random.shuffle(flute_pool) random.shuffle(flute_pool)
f = 0 f = 0