monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set triforce pieces available to max of available and required.

This commit is contained in:
caitsith2 2020-06-17 01:33:34 -07:00
parent 617312fd4b
commit d8bc5ca2a8
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ItemList.py
View File

@ -511,8 +511,6 @@ def get_pool_core(world, player: int):
extraitems -= len(diff.timedohko) extraitems -= len(diff.timedohko)
clock_mode = 'countdown-ohko' clock_mode = 'countdown-ohko'
if goal in {'triforcehunt', 'localtriforcehunt'}: if goal in {'triforcehunt', 'localtriforcehunt'}:
if world.triforce_pieces_required[player] > world.triforce_pieces_available[player]:
world.triforce_pieces_required[player] = world.triforce_pieces_available[player]
while len(diff.triforcehunt) > world.triforce_pieces_available[player]: while len(diff.triforcehunt) > world.triforce_pieces_available[player]:
diff.triforcehunt.pop() diff.triforcehunt.pop()
pool.extend(diff.triforcehunt) pool.extend(diff.triforcehunt)

2
Main.py
View File

@ -88,6 +88,8 @@ def main(args, seed=None):
world.push_precollected(item) world.push_precollected(item)
world.local_items[player] = {item.strip() for item in args.local_items[player].split(',')} world.local_items[player] = {item.strip() for item in args.local_items[player].split(',')}
world.triforce_pieces_available[player] = max(world.triforce_pieces_available[player], world.triforce_pieces_required[player])
if world.mode[player] != 'inverted': if world.mode[player] != 'inverted':
create_regions(world, player) create_regions(world, player)
else: else:

2
Mystery.py
View File

@ -302,7 +302,7 @@ def roll_settings(weights):
ret.triforce_pieces_required = get_choice('triforce_pieces_required', ret.triforce_pieces_required = get_choice('triforce_pieces_required',
weights) if "triforce_pieces_required" in weights else 20 weights) if "triforce_pieces_required" in weights else 20
ret.triforce_pieces_required = min(max(1, int(ret.triforce_pieces_required)), ret.triforce_pieces_available) ret.triforce_pieces_required = min(max(1, int(ret.triforce_pieces_required)), 112)
ret.mode = get_choice('world_state', weights) ret.mode = get_choice('world_state', weights)
if ret.mode == 'retro': if ret.mode == 'retro':