untangle start_randomizer

not as bad as some of the functions, but still a couple control flow
errors
master
magical 2024-02-03 01:28:16 -08:00
parent 707a7b70a1
commit 12a22c8724
1 changed files with 17 additions and 21 deletions

View File

@ -3065,7 +3065,7 @@ def start_randomizer(rom, settings):
if settings['Num']:
if settings['Num'] > repeat:
repeat = settings['Num']
settings.pop('Num')
settings.pop('Num')
if settings['Patch']:
Patch = True
else:
@ -3124,26 +3124,22 @@ def start_randomizer(rom, settings):
elif nodeType == 'Boss':
World.add_to_majors(name)
BossLocations.append(name)
else:
if nodeType == 'Data' or item == 'E-Tank':
World.add_to_majors(name)
if name == 'Data S3':
BossLocations.append(name)
if not 'Item' in name:
if not nodeType == 'Boss':
if nodeType == 'Data':
pass
AreaItemLocations[areaIndex].append(name)
elif nodeType == 'Data' or item == 'E-Tank':
World.add_to_majors(name)
if name == 'Data S3':
BossLocations.append(name)
if 'Item' in name or nodeType == 'Boss' or nodeType == 'Data':
AreaItemLocations[areaIndex].append(name)
World.ConnectAllNodes()
StartLocation = 'S0-00'
startTime = time.time()
randomize_game(World)
seedTime = time.time() - startTime
print(str(FileName))
print('Randomized in:', seedTime)
World.ConnectAllNodes()
StartLocation = 'S0-00'
startTime = time.time()
randomize_game(World)
seedTime = time.time() - startTime
print(str(FileName))
print('Randomized in:', seedTime)
totalRandoTime = time.time() - totalRandoTime
print('All seeds took:', totalRandoTime)
return FileName
totalRandoTime = time.time() - totalRandoTime
print('All seeds took:', totalRandoTime)
return FileName