Merge branch 'OverworldShuffleDev' into OverworldShuffle

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()

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,

resources/app/cli/args.json

@@ -43,7 +43,8 @@
       "pedestal",
       "dungeons",
       "triforcehunt",
-      "crystals"
+      "crystals",
+      "trinity"
     ]
   },
   "difficulty": {