From 2541e6d7a03373999154fb92a920e73d7c4ca918 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Tue, 4 Jan 2022 20:38:11 -0600 Subject: [PATCH] Fixed issue with CLI vs GUI for TFH args --- BaseClasses.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/BaseClasses.py b/BaseClasses.py index 40472347..752b96ae 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -2839,7 +2839,9 @@ class Spoiler(object): if self.world.custom and p in self.world.customitemarray: self.metadata['triforcegoal'][p], self.metadata['triforcepool'][p] = set_default_triforce(self.metadata['goal'][p], self.world.customitemarray[p]["triforcepiecesgoal"], self.world.customitemarray[p]["triforcepieces"]) else: - self.metadata['triforcegoal'][p], self.metadata['triforcepool'][p] = set_default_triforce(self.metadata['goal'][p], self.world.treasure_hunt_count, self.world.treasure_hunt_total) + custom_goal = self.world.treasure_hunt_count[p] if isinstance(self.world.treasure_hunt_count, dict) else self.world.treasure_hunt_count + custom_total = self.world.treasure_hunt_total[p] if isinstance(self.world.treasure_hunt_total, dict) else self.world.treasure_hunt_total + self.metadata['triforcegoal'][p], self.metadata['triforcepool'][p] = set_default_triforce(self.metadata['goal'][p], custom_goal, custom_total) def parse_data(self): self.medallions = OrderedDict()