From 0448ceeb7e814dd5c53ed7fc0c85d5db4eee337e Mon Sep 17 00:00:00 2001 From: codemann8 Date: Thu, 13 May 2021 06:01:58 -0500 Subject: [PATCH] Hide OW Edges in Spoiler if vanilla --- BaseClasses.py | 3 ++- OverworldShuffle.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index 9270a579..07f8f7f2 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -2229,7 +2229,8 @@ class Spoiler(object): 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 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')) + if self.metadata['ow_shuffle'][player] != 'vanilla': + outfile.write('Keep OW Edges Together:'.ljust(line_width) + '%s\n' % ('Yes' if self.metadata['ow_keepsimilar'][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]) diff --git a/OverworldShuffle.py b/OverworldShuffle.py index 882fc70d..4cf2185b 100644 --- a/OverworldShuffle.py +++ b/OverworldShuffle.py @@ -246,7 +246,8 @@ def connect_two_way(world, edgename1, edgename2, player): x.dest = y y.dest = x - world.spoiler.set_overworld(edgename2, edgename1, 'both', player) + if world.owShuffle[player] != 'vanilla': + world.spoiler.set_overworld(edgename2, edgename1, 'both', player) def remove_reserved(world, groupedlist, connected_edges, player): #TODO: Remove edges set in connect_custom