From c47090ce6104ff666653b06c9d2871b86470c45c Mon Sep 17 00:00:00 2001 From: Fouton Date: Fri, 12 Mar 2021 22:15:27 -0500 Subject: [PATCH] Add files via upload --- BaseClasses.py | 5 +++++ ItemList.py | 2 ++ 2 files changed, 7 insertions(+) diff --git a/BaseClasses.py b/BaseClasses.py index 2fc04482..50c97c71 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -1971,6 +1971,8 @@ class Spoiler(object): 'experimental': self.world.experimental, 'keydropshuffle': self.world.keydropshuffle, 'shopsanity': self.world.shopsanity, + 'triforcegoal': self.world.treasure_hunt_count, + 'triforcepool': self.world.treasure_hunt_total, 'code': {p: Settings.make_code(self.world, p) for p in range(1, self.world.players + 1)} } @@ -2014,6 +2016,9 @@ class Spoiler(object): outfile.write('Retro: %s\n' % ('Yes' if self.metadata['retro'][player] else 'No')) outfile.write('Swords: %s\n' % self.metadata['weapons'][player]) outfile.write('Goal: %s\n' % self.metadata['goal'][player]) + if self.metadata['goal'][player] == 'triforcehunt': + outfile.write('Triforce Pieces Required: %s\n' % self.metadata['triforcegoal'][player]) + outfile.write('Triforce Pieces Total: %s\n' % self.metadata['triforcepool'][player]) outfile.write('Difficulty: %s\n' % self.metadata['item_pool'][player]) outfile.write('Item Functionality: %s\n' % self.metadata['item_functionality'][player]) outfile.write('Entrance Shuffle: %s\n' % self.metadata['shuffle'][player]) diff --git a/ItemList.py b/ItemList.py index 06e9ba64..500c1af8 100644 --- a/ItemList.py +++ b/ItemList.py @@ -316,6 +316,8 @@ def generate_itempool(world, player): if world.goal[player] == 'triforcehunt': if world.treasure_hunt_count[player] == 0: world.treasure_hunt_count[player] = 20 + if world.treasure_hunt_total[player] == 0: + world.treasure_hunt_total[player] = 30 world.treasure_hunt_icon[player] = 'Triforce Piece' if world.custom: world.treasure_hunt_count[player] = treasure_hunt_count