alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge remote-tracking branch 'origin/DoorDevUnstable' into DoorDevUnstable

Browse Source
This commit is contained in:
aerinon
2021-01-04 13:24:19 -07:00
parent e67653577e b14ecddc22
commit 3053942243
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Rom.py
View File

@@ -284,14 +284,23 @@ def patch_enemizer(world, player, rom, baserom_path, enemizercli, random_sprite_
with open(options_path, 'w') as f: with open(options_path, 'w') as f:
json.dump(options, f) json.dump(options, f)
subprocess.check_call([os.path.abspath(enemizercli), try:
'--rom', baserom_path, subprocess.run([os.path.abspath(enemizercli),
'--seed', str(world.rom_seeds[player]), '--rom', baserom_path,
'--base', basepatch_path, '--seed', str(world.rom_seeds[player]),
'--randomizer', randopatch_path, '--base', basepatch_path,
'--enemizer', options_path, '--randomizer', randopatch_path,
'--output', enemizer_output_path], '--enemizer', options_path,
cwd=os.path.dirname(enemizercli), stdout=subprocess.DEVNULL) '--output', enemizer_output_path],
cwd=os.path.dirname(enemizercli),
check=True,
capture_output=True)
except subprocess.CalledProcessError as e:
from Main import EnemizerError
enemizerMsg = world.fish.translate("cli","cli","Enemizer returned exit code: ") + str(e.returncode) + "\n"
enemizerMsg += world.fish.translate("cli","cli","enemizer.nothing.applied")
logging.error(f'Enemizer error output: {e.stderr.decode("utf-8")}\n')
raise EnemizerError(enemizerMsg)
with open(enemizer_basepatch_path, 'r') as f: with open(enemizer_basepatch_path, 'r') as f:
for patch in json.load(f): for patch in json.load(f):
@@ -2579,4 +2588,4 @@ def write_pots_to_rom(rom, pot_contents):
write_int16(rom, pot_item_room_table_lookup + 2*i, n-2) write_int16(rom, pot_item_room_table_lookup + 2*i, n-2)
else: else:
write_int16(rom, pot_item_room_table_lookup + 2*i, n-2) write_int16(rom, pot_item_room_table_lookup + 2*i, n-2)
assert n <= pot_item_table_end assert n <= pot_item_table_end