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

Change max triforce_pieces_required from 30 to 112.

This commit is contained in:
caitsith2 2020-06-11 11:53:10 -07:00
parent 403732e121
commit 233d12be30
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
EntranceRandomizer.py
View File

@ -82,7 +82,7 @@ def parse_arguments(argv, no_defaults=False):
20 of them to beat the game.
''')
parser.add_argument('--triforce_pieces_required', default=defval(20),
type=lambda value: min(max(int(value), 1), 30),
type=lambda value: min(max(int(value), 1), 112),
help='''Set Triforce Pieces required to win a Triforce Hunt''')
parser.add_argument('--difficulty', default=defval('normal'), const='normal', nargs='?',
choices=['normal', 'hard', 'expert'],

10
ItemList.py
View File

@ -256,7 +256,15 @@ def generate_itempool(world, player):
return item if not choice else ItemFactory("Bee Trap", player) if choice == 'trap' else ItemFactory("Bee", player)
return item
world.itempool += [beemizer(item) for item in items]
progressionitems = [item for item in items if item.advancement or item.priority or item.type]
nonprogressionitems = [beemizer(item) for item in items if not item.advancement and not item.priority and not item.type]
random.shuffle(nonprogressionitems)
if treasure_hunt_count and treasure_hunt_count > 30:
progressionitems += [ItemFactory("Triforce Piece", player)] * (treasure_hunt_count - 30)
nonprogressionitems = nonprogressionitems[(treasure_hunt_count-30):]
world.itempool += progressionitems + nonprogressionitems
# shuffle medallions
mm_medallion = ['Ether', 'Quake', 'Bombos'][random.randint(0, 2)]

2
Mystery.py
View File

@ -297,7 +297,7 @@ def roll_settings(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.triforce_pieces_required = min(max(1, int(ret.triforce_pieces_required)), 112)
ret.mode = get_choice('world_state', weights)
if ret.mode == 'retro':