From fe358e921a058f3a96655ee20126a2559a6bd9d9 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sun, 31 Oct 2021 19:47:57 -0500 Subject: [PATCH] Added missing Starting Equipment section in spoiler log --- BaseClasses.py | 2 +- Main.py | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index a2bf19b5..b1dee353 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -2810,7 +2810,7 @@ class Spoiler(object): if self.startinventory: outfile.write('Starting Inventory:'.ljust(line_width)) - outfile.write('\n'.ljust(line_width+1).join(self.startinventory)) + outfile.write('\n'.ljust(line_width+1).join(self.startinventory) + '\n') def to_file(self, filename): self.parse_data() diff --git a/Main.py b/Main.py index b5740bf4..e4c14248 100644 --- a/Main.py +++ b/Main.py @@ -136,10 +136,6 @@ def main(args, seed=None, fish=None): else: outfilebase = f'DR_{args.outputname if args.outputname else world.seed}' - if args.create_spoiler and not args.jsonout: - logger.info(world.fish.translate("cli","cli","patching.spoiler")) - world.spoiler.meta_to_file(output_path('%s_Spoiler.txt' % outfilebase)) - for player in range(1, world.players + 1): world.difficulty_requirements[player] = difficulties[world.difficulty[player]] @@ -151,7 +147,12 @@ def main(args, seed=None, fish=None): item = ItemFactory(tok.strip(), player) if item: world.push_precollected(item) + + if args.create_spoiler and not args.jsonout: + logger.info(world.fish.translate("cli","cli","patching.spoiler")) + world.spoiler.meta_to_file(output_path('%s_Spoiler.txt' % outfilebase)) + for player in range(1, world.players + 1): create_regions(world, player) create_dungeon_regions(world, player) create_owedges(world, player)