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

Individual settings: shufflepots and shufflepalette

This commit is contained in:
Bonta-kun 2019-12-18 21:20:55 +01:00
parent 80d9fda10f
commit 5f77aaba06
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
EntranceRandomizer.py
View File

@ -281,7 +281,7 @@ def parse_arguments(argv, no_defaults=False):
for name in ['logic', 'mode', 'swords', 'goal', 'difficulty', 'item_functionality', for name in ['logic', 'mode', 'swords', 'goal', 'difficulty', 'item_functionality',
'shuffle', 'crystals_ganon', 'crystals_gt', 'openpyramid', 'shuffle', 'crystals_ganon', 'crystals_gt', 'openpyramid',
'mapshuffle', 'compassshuffle', 'keyshuffle', 'bigkeyshuffle', 'mapshuffle', 'compassshuffle', 'keyshuffle', 'bigkeyshuffle',
'retro', 'accessibility', 'hints', 'retro', 'accessibility', 'hints', 'shufflepalette', 'shufflepots',
'shufflebosses', 'shuffleenemies', 'enemy_health', 'enemy_damage']: 'shufflebosses', 'shuffleenemies', 'enemy_health', 'enemy_damage']:
value = getattr(defaults, name) if getattr(playerargs, name) is None else getattr(playerargs, name) value = getattr(defaults, name) if getattr(playerargs, name) is None else getattr(playerargs, name)
if player == 1: if player == 1:

4
Main.py
View File

@ -141,7 +141,7 @@ def main(args, seed=None):
for player in range(1, world.players + 1): for player in range(1, world.players + 1):
use_enemizer = (world.boss_shuffle[player] != 'none' or world.enemy_shuffle[player] != 'none' use_enemizer = (world.boss_shuffle[player] != 'none' or world.enemy_shuffle[player] != 'none'
or world.enemy_health[player] != 'default' or world.enemy_damage[player] != 'default' or world.enemy_health[player] != 'default' or world.enemy_damage[player] != 'default'
or args.shufflepalette or args.shufflepots) or args.shufflepalette[player] or args.shufflepots[player])
local_rom = None local_rom = None
if args.jsonout: if args.jsonout:
@ -156,7 +156,7 @@ def main(args, seed=None):
enemizer_patch = [] enemizer_patch = []
if use_enemizer: if use_enemizer:
enemizer_patch = get_enemizer_patch(world, player, rom, args.rom, args.enemizercli, args.shufflepalette, args.shufflepots) enemizer_patch = get_enemizer_patch(world, player, rom, args.rom, args.enemizercli, args.shufflepalette[player], args.shufflepots[player])
multidata.rom_names[player] = list(rom.name) multidata.rom_names[player] = list(rom.name)
for location in world.get_filled_locations(player): for location in world.get_filled_locations(player):