From 605bacf4904ad423008a63754cb6ca2942c2b1ea Mon Sep 17 00:00:00 2001 From: codemann8 Date: Wed, 29 Oct 2025 15:17:24 -0500 Subject: [PATCH] Implemented Custom Goal Framework --- BaseClasses.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index fc4f6394..f2305238 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -3272,17 +3272,17 @@ class Spoiler(object): outfile.write('Triforce Pieces Required:'.ljust(line_width) + '%s\n' % self.metadata['triforcegoal'][player]) outfile.write('Triforce Pieces Total:'.ljust(line_width) + '%s\n' % self.metadata['triforcepool'][player]) custom = self.metadata['custom_goals'][player] - if 'requirements' in custom['gtentry']: + if custom['gtentry'] and 'requirements' in custom['gtentry']: outfile.write('GT Entry Requirement:'.ljust(line_width) + 'custom\n') else: outfile.write('GT Entry Requirement:'.ljust(line_width) + '%s crystals\n' % str(self.world.crystals_gt_orig[player])) - if 'requirements' in custom['ganongoal']: + if custom['ganongoal'] and 'requirements' in custom['ganongoal']: outfile.write('Ganon Requirement:'.ljust(line_width) + 'custom\n') else: outfile.write('Ganon Requirement:'.ljust(line_width) + '%s crystals\n' % str(self.world.crystals_ganon_orig[player])) - if 'requirements' in custom['pedgoal']: + if custom['pedgoal'] and 'requirements' in custom['pedgoal']: outfile.write('Pedestal Requirement:'.ljust(line_width) + 'custom\n') - if 'requirements' in custom['murahgoal']: + if custom['murahgoal'] and 'requirements' in custom['murahgoal']: outfile.write('Murahdahla Requirement:'.ljust(line_width) + 'custom\n') outfile.write('Swords:'.ljust(line_width) + '%s\n' % self.metadata['weapons'][player]) outfile.write('\n')