From 5f77aaba06f3e375d209f6513545939ec24360f2 Mon Sep 17 00:00:00 2001 From: Bonta-kun <40473493+Bonta0@users.noreply.github.com> Date: Wed, 18 Dec 2019 21:20:55 +0100 Subject: [PATCH] Individual settings: shufflepots and shufflepalette --- EntranceRandomizer.py | 2 +- Main.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/EntranceRandomizer.py b/EntranceRandomizer.py index f7b6ec22..be702203 100755 --- a/EntranceRandomizer.py +++ b/EntranceRandomizer.py @@ -281,7 +281,7 @@ def parse_arguments(argv, no_defaults=False): for name in ['logic', 'mode', 'swords', 'goal', 'difficulty', 'item_functionality', 'shuffle', 'crystals_ganon', 'crystals_gt', 'openpyramid', 'mapshuffle', 'compassshuffle', 'keyshuffle', 'bigkeyshuffle', - 'retro', 'accessibility', 'hints', + 'retro', 'accessibility', 'hints', 'shufflepalette', 'shufflepots', 'shufflebosses', 'shuffleenemies', 'enemy_health', 'enemy_damage']: value = getattr(defaults, name) if getattr(playerargs, name) is None else getattr(playerargs, name) if player == 1: diff --git a/Main.py b/Main.py index 20645b08..b761e6e3 100644 --- a/Main.py +++ b/Main.py @@ -141,7 +141,7 @@ def main(args, seed=None): for player in range(1, world.players + 1): 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 args.shufflepalette or args.shufflepots) + or args.shufflepalette[player] or args.shufflepots[player]) local_rom = None if args.jsonout: @@ -156,7 +156,7 @@ def main(args, seed=None): enemizer_patch = [] 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) for location in world.get_filled_locations(player):