alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Merge remote-tracking branch 'origin' into OverworldShuffle

Browse Source
This commit is contained in:
Kara Alexandra
2023-09-04 18:35:36 -05:00
parent 679cecbe28 196279b65f
commit 4459704252
76 changed files with 4251 additions and 2604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/tools/MysteryUtils.py
View File

@@ -98,6 +98,7 @@ def roll_settings(weights):
ret.trap_door_mode = get_choice('trap_door_mode')
ret.key_logic_algorithm = get_choice('key_logic_algorithm')
ret.decoupledoors = get_choice('decoupledoors') == 'on'
ret.door_self_loops = get_choice('door_self_loops') == 'on'
ret.experimental = get_choice('experimental') == 'on'
ret.collection_rate = get_choice('collection_rate') == 'on'
@@ -111,7 +112,7 @@ def roll_settings(weights):
ret.dropshuffle = get_choice('dropshuffle') == 'on' or keydropshuffle
ret.pottery = get_choice('pottery') if 'pottery' in weights else 'none'
ret.pottery = 'keys' if ret.pottery == 'none' and keydropshuffle else ret.pottery
ret.colorizepots = get_choice('colorizepots') == 'on'
ret.colorizepots = get_choice_default('colorizepots', default='on') == 'on'
ret.shufflepots = get_choice('pot_shuffle') == 'on'
ret.mixed_travel = get_choice('mixed_travel') if 'mixed_travel' in weights else 'prevent'
ret.standardize_palettes = (get_choice('standardize_palettes') if 'standardize_palettes' in weights
@@ -142,15 +143,14 @@ def roll_settings(weights):
ganon_item = get_choice('ganon_item')
ret.ganon_item = ganon_item if ganon_item != 'none' else 'default'
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':