Fixed default TF pieces in Trinity

This commit is contained in:
codemann8
2022-05-16 14:01:23 -05:00
parent 377660a1f5
commit 4d550a38e8

View File

@@ -208,12 +208,16 @@ def roll_settings(weights):
ret.crystals_gt = get_choice('tower_open') ret.crystals_gt = get_choice('tower_open')
ret.crystals_ganon = get_choice('ganon_open') ret.crystals_ganon = get_choice('ganon_open')
goal_min = get_choice_default('triforce_goal_min', default=20) from ItemList import set_default_triforce
goal_max = get_choice_default('triforce_goal_max', default=20) default_tf_goal, default_tf_pool = set_default_triforce(ret.goal, 0, 0)
pool_min = get_choice_default('triforce_pool_min', default=30) goal_min = get_choice_default('triforce_goal_min', default=default_tf_goal)
pool_max = get_choice_default('triforce_pool_max', default=30) 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)
logging.getLogger('').warning(goal_min)
logging.getLogger('').warning(goal_max)
ret.triforce_goal = random.randint(int(goal_min), int(goal_max)) ret.triforce_goal = random.randint(int(goal_min), int(goal_max))
min_diff = get_choice_default('triforce_min_difference', default=10) 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 = random.randint(max(int(pool_min), ret.triforce_goal + int(min_diff)), int(pool_max))
ret.mode = get_choice('world_state') ret.mode = get_choice('world_state')