From 8ddb1ab6144e650a8e5daf4449d8c0cdde7b0fda Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Wed, 27 Jan 2021 02:39:12 +0100 Subject: [PATCH] create per-team enemizer calls --- Main.py | 2 +- Rom.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Main.py b/Main.py index 281e3f03..0c24a46e 100644 --- a/Main.py +++ b/Main.py @@ -234,7 +234,7 @@ def main(args, seed=None): patch_rom(world, rom, player, team, use_enemizer) if use_enemizer: - patch_enemizer(world, player, rom, args.enemizercli) + patch_enemizer(world, team, player, rom, args.enemizercli) if args.race: patch_race_rom(rom, world, player) diff --git a/Rom.py b/Rom.py index 1c0df629..6c434813 100644 --- a/Rom.py +++ b/Rom.py @@ -272,11 +272,11 @@ def apply_random_sprite_on_event(rom: LocalRom, sprite, local_random, allow_rand rom.write_bytes(0x307078 + (i * 0x8000), sprite.glove_palette) -def patch_enemizer(world, player: int, rom: LocalRom, enemizercli): +def patch_enemizer(world, team: int, player: int, rom: LocalRom, enemizercli): check_enemizer(enemizercli) - randopatch_path = os.path.abspath(output_path(f'enemizer_randopatch_{player}.sfc')) - options_path = os.path.abspath(output_path(f'enemizer_options_{player}.json')) - enemizer_output_path = os.path.abspath(output_path(f'enemizer_output_{player}.sfc')) + randopatch_path = os.path.abspath(output_path(f'enemizer_randopatch_{team}_{player}.sfc')) + options_path = os.path.abspath(output_path(f'enemizer_options_{team}_{player}.json')) + enemizer_output_path = os.path.abspath(output_path(f'enemizer_output_{team}_{player}.sfc')) # write options file for enemizer options = {