From 51c03ffd2b72116dbef5a1712a64d01de37c2009 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Mon, 3 Jan 2022 23:18:54 -0600 Subject: [PATCH] Fixed default TF pieces from CLI --- BaseClasses.py | 2 +- CLI.py | 6 +++--- resources/app/cli/args.json | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index 4b63d4a4..40472347 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -2839,7 +2839,7 @@ 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], 0, 0) + 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) def parse_data(self): self.medallions = OrderedDict() diff --git a/CLI.py b/CLI.py index 198325b7..bc960b5d 100644 --- a/CLI.py +++ b/CLI.py @@ -176,13 +176,13 @@ def parse_settings(): "mixed_travel": "prevent", "standardize_palettes": "standardize", - "triforce_pool": 30, - "triforce_goal": 20, + "triforce_pool": 0, + "triforce_goal": 0, "triforce_pool_min": 0, "triforce_pool_max": 0, "triforce_goal_min": 0, "triforce_goal_max": 0, - "triforce_min_difference": 10, + "triforce_min_difference": 0, "code": "", "multi": 1, diff --git a/resources/app/cli/args.json b/resources/app/cli/args.json index 8e10afde..49f42552 100644 --- a/resources/app/cli/args.json +++ b/resources/app/cli/args.json @@ -43,7 +43,8 @@ "pedestal", "dungeons", "triforcehunt", - "crystals" + "crystals", + "trinity" ] }, "difficulty": {