Merge branch 'master' into msu_v32

This commit is contained in:
CaitSith2
2020-06-08 02:04:41 -07:00
committed by GitHub
9 changed files with 52 additions and 24 deletions

View File

@@ -294,6 +294,10 @@ def roll_settings(weights):
ret.crystals_ganon = get_choice('ganon_open', weights)
ret.triforce_pieces_required = get_choice('triforce_pieces_required',
weights) if "triforce_pieces_required" in weights else 20
ret.triforce_pieces_required = min(max(1, int(ret.triforce_pieces_required)), 30)
ret.mode = get_choice('world_state', weights)
if ret.mode == 'retro':
ret.mode = 'open'