Merged Parallel Worlds into OW Layout Shuffle setting

This commit is contained in:
codemann8
2021-05-09 19:06:13 -05:00
parent 1f735882d9
commit 1f3f20b923
11 changed files with 183 additions and 208 deletions

View File

@@ -25,7 +25,6 @@ class World(object):
self.teams = 1
self.owShuffle = owShuffle.copy()
self.owKeepSimilar = {}
self.owParallelWorlds = {}
self.shuffle = shuffle.copy()
self.doorShuffle = doorShuffle.copy()
self.intensity = {}
@@ -2096,7 +2095,6 @@ class Spoiler(object):
'goal': self.world.goal,
'ow_shuffle': self.world.owShuffle,
'ow_keepsimilar': self.world.owKeepSimilar,
'ow_parallel': self.world.owParallelWorlds,
'shuffle': self.world.shuffle,
'door_shuffle': self.world.doorShuffle,
'intensity': self.world.intensity,
@@ -2174,9 +2172,8 @@ class Spoiler(object):
outfile.write('Triforce Pieces Total:'.ljust(line_width) + '%s\n' % self.metadata['triforcepool'][player])
outfile.write('Difficulty:'.ljust(line_width) + '%s\n' % self.metadata['item_pool'][player])
outfile.write('Item Functionality:'.ljust(line_width) + '%s\n' % self.metadata['item_functionality'][player])
outfile.write('Overworld Shuffle:'.ljust(line_width) + '%s\n' % self.metadata['ow_shuffle'][player])
outfile.write('Overworld Layout Shuffle:'.ljust(line_width) + '%s\n' % self.metadata['ow_shuffle'][player])
outfile.write('Keep OW Edges Together:'.ljust(line_width) + '%s\n' % ('Yes' if self.metadata['ow_keepsimilar'][player] else 'No'))
outfile.write('Parallel Worlds:'.ljust(line_width) + '%s\n' % ('Yes' if self.metadata['ow_parallel'][player] else 'No'))
outfile.write('Entrance Shuffle:'.ljust(line_width) + '%s\n' % self.metadata['shuffle'][player])
outfile.write('Door Shuffle:'.ljust(line_width) + '%s\n' % self.metadata['door_shuffle'][player])
outfile.write('Intensity:'.ljust(line_width) + '%s\n' % self.metadata['intensity'][player])