Merge branch 'Catobat-TriforceMinMax' into DoorDevUnstable

CLI.py

@@ -132,7 +132,7 @@ def parse_cli(argv, no_defaults=False):
                          'flute_mode', 'bow_mode', 'take_any', 'boots_hint',
                          'shuffle', 'door_shuffle', 'intensity', 'crystals_ganon', 'crystals_gt', 'openpyramid',
                          'mapshuffle', 'compassshuffle', 'keyshuffle', 'bigkeyshuffle', 'startinventory',
-                         'usestartinventory', 'bombbag', 'overworld_map', 'restrict_boss_items',
+                         'usestartinventory', 'bombbag', 'overworld_map', 'restrict_boss_items', 'triforce_max_difference',
                          'triforce_pool_min', 'triforce_pool_max', 'triforce_goal_min', 'triforce_goal_max',
                          'triforce_min_difference', 'triforce_goal', 'triforce_pool', 'shufflelinks', 'shuffletavern',
                          'pseudoboots', 'retro', 'accessibility', 'hints', 'beemizer', 'experimental', 'dungeon_counters',
@@ -229,7 +229,8 @@ def parse_settings():
         "triforce_pool_max": 0,
         "triforce_goal_min": 0,
         "triforce_goal_max": 0,
-        "triforce_min_difference": 10,
+        "triforce_min_difference": 0,
+        "triforce_max_difference": 10000,
 
         "code": "",
         "multi": 1,

Main.py

@@ -124,8 +124,6 @@ def main(args, seed=None, fish=None):
     world.potshuffle = args.shufflepots.copy()
     world.mixed_travel = args.mixed_travel.copy()
     world.standardize_palettes = args.standardize_palettes.copy()
-    world.treasure_hunt_count = {k: int(v) for k, v in args.triforce_goal.items()}
-    world.treasure_hunt_total = {k: int(v) for k, v in args.triforce_pool.items()}
     world.shufflelinks = args.shufflelinks.copy()
     world.shuffletavern = args.shuffletavern.copy()
     world.pseudoboots = args.pseudoboots.copy()
@@ -135,6 +133,26 @@ def main(args, seed=None, fish=None):
     world.collection_rate = args.collection_rate.copy()
     world.colorizepots = args.colorizepots.copy()
 
+    world.treasure_hunt_count = {}
+    world.treasure_hunt_total = {}
+    for p in args.triforce_goal:
+        if int(args.triforce_goal[p]) != 0 or int(args.triforce_pool[p]) != 0 or int(args.triforce_goal_min[p]) != 0 or int(args.triforce_goal_max[p]) != 0 or int(args.triforce_pool_min[p]) != 0 or int(args.triforce_pool_max[p]) != 0:
+            if int(args.triforce_goal[p]) != 0:
+                world.treasure_hunt_count[p] = int(args.triforce_goal[p])
+            elif int(args.triforce_goal_min[p]) != 0 and int(args.triforce_goal_max[p]) != 0:
+                world.treasure_hunt_count[p] = random.randint(int(args.triforce_goal_min[p]), int(args.triforce_goal_max[p]))
+            else:
+                world.treasure_hunt_count[p] = 8 if world.goal[p] == 'trinity' else 20
+            if int(args.triforce_pool[p]) != 0:
+                world.treasure_hunt_total[p] = int(args.triforce_pool[p])
+            elif int(args.triforce_pool_min[p]) != 0 and int(args.triforce_pool_max[p]) != 0:
+                world.treasure_hunt_total[p] = random.randint(max(int(args.triforce_pool_min[p]), world.treasure_hunt_count[p] + int(args.triforce_min_difference[p])), min(int(args.triforce_pool_max[p]), world.treasure_hunt_count[p] + int(args.triforce_max_difference[p])))
+            else:
+                world.treasure_hunt_total[p] = 10 if world.goal[p] == 'trinity' else 30
+        else:
+            # this will be handled in ItemList.py and custom item pool is used to determine the numbers
+            world.treasure_hunt_count[p], world.treasure_hunt_total[p] = 0, 0
+
     world.rom_seeds = {player: random.randint(0, 999999999) for player in range(1, world.players + 1)}
     world.finish_init()
 

README.md

@@ -573,13 +573,14 @@ Create bps patch(es) instead of generating rom(s) for distribution. `--bps`
 
 ### Triforce Hunt Settings
 
-A collection of settings to control the triforce piece pool for the CLI/Mystery
+A collection of settings to control the triforce piece pool if not specified through --triforce_goal and --triforce_pool
 
 * --triforce_goal_min: Minimum number of pieces to collect to win
 * --triforce_goal_max: Maximum number of pieces to collect to win
 * --triforce_pool_min: Minimum number of pieces in item pool
 * --triforce_pool_max: Maximum number of pieces in item pool
 * --triforce_min_difference: Minimum difference between pool and goal to win
+* --triforce_max_difference: Maximum difference between pool and goal to win
 
 ### Seed
 

mystery_example.yml

@@ -107,6 +107,7 @@
   triforce_pool_min: 20
   triforce_pool_max: 40
   triforce_min_difference: 10
+  triforce_max_difference: 15
   dungeon_items:
     standard: 10
     mc: 3

mystery_testsuite.yml

@@ -83,6 +83,7 @@ triforce_goal_max: 30
 triforce_pool_min: 30
 triforce_pool_max: 40
 triforce_min_difference: 10
+triforce_max_difference: 12
 map_shuffle:
   on: 1
   off: 1

resources/app/cli/args.json

@@ -339,6 +339,7 @@
   "triforce_goal_min": {},
   "triforce_goal_max": {},
   "triforce_min_difference": {},
+  "triforce_max_difference": {},
   "custom": {
     "type": "bool",
     "help": "suppress"

source/classes/CustomSettings.py

@@ -144,6 +144,12 @@ class CustomSettings(object):
                 args.pseudoboots[p] = get_setting(settings['pseudoboots'], args.pseudoboots[p])
                 args.triforce_goal[p] = get_setting(settings['triforce_goal'], args.triforce_goal[p])
                 args.triforce_pool[p] = get_setting(settings['triforce_pool'], args.triforce_pool[p])
+                args.triforce_goal_min[p] = get_setting(settings['triforce_goal_min'], args.triforce_goal_min[p])
+                args.triforce_goal_max[p] = get_setting(settings['triforce_goal_max'], args.triforce_goal_max[p])
+                args.triforce_pool_min[p] = get_setting(settings['triforce_pool_min'], args.triforce_pool_min[p])
+                args.triforce_pool_max[p] = get_setting(settings['triforce_pool_max'], args.triforce_pool_max[p])
+                args.triforce_min_difference[p] = get_setting(settings['triforce_min_difference'], args.triforce_min_difference[p])
+                args.triforce_max_difference[p] = get_setting(settings['triforce_max_difference'], args.triforce_max_difference[p])
                 args.beemizer[p] = get_setting(settings['beemizer'], args.beemizer[p])
 
                 # mystery usage

source/tools/MysteryUtils.py

@@ -125,15 +125,14 @@ def roll_settings(weights):
 
     ret.crystals_ganon = get_choice('ganon_open')
 
-    from ItemList import set_default_triforce
-    default_tf_goal, default_tf_pool = set_default_triforce(ret.goal, 0, 0)
-    goal_min = get_choice_default('triforce_goal_min', default=default_tf_goal)
-    goal_max = get_choice_default('triforce_goal_max', default=default_tf_goal)
-    pool_min = get_choice_default('triforce_pool_min', default=default_tf_pool)
-    pool_max = get_choice_default('triforce_pool_max', default=default_tf_pool)
-    ret.triforce_goal = random.randint(int(goal_min), int(goal_max))
-    min_diff = get_choice_default('triforce_min_difference', default=default_tf_pool-default_tf_goal)
-    ret.triforce_pool = random.randint(max(int(pool_min), ret.triforce_goal + int(min_diff)), int(pool_max))
+    ret.triforce_pool = get_choice_default('triforce_pool', default=0)
+    ret.triforce_goal = get_choice_default('triforce_goal', default=0)
+    ret.triforce_pool_min = get_choice_default('triforce_pool_min', default=0)
+    ret.triforce_pool_max = get_choice_default('triforce_pool_max', default=0)
+    ret.triforce_goal_min = get_choice_default('triforce_goal_min', default=0)
+    ret.triforce_goal_max = get_choice_default('triforce_goal_max', default=0)
+    ret.triforce_min_difference = get_choice_default('triforce_min_difference', default=0)
+    ret.triforce_max_difference = get_choice_default('triforce_max_difference', default=10000)
 
     ret.mode = get_choice('world_state')
     if ret.mode == 'retro':