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

Fix a bunch of stuff

Browse Source 
Defaults from settings file, then CLI, then canned defaults
Fix Adjust settings
Fix Custom Item Array settings
Create error message for Enemizer Not Found
This commit is contained in:
Mike A. Trethewey
2020-02-20 01:04:53 -08:00
parent d82c4c9d70
commit dbaaef662a
6 changed files with 75 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Main.py
View File

@@ -180,9 +180,13 @@ def main(args, seed=None):
patch_rom(world, rom, player, team, use_enemizer)
if use_enemizer and (args.enemizercli or not args.jsonout):
patch_enemizer(world, player, rom, args.rom, args.enemizercli, args.shufflepots[player], sprite_random_on_hit)
if not args.jsonout:
rom = LocalRom.fromJsonRom(rom, args.rom, 0x400000)
if os.path.exists(args.enemizercli):
patch_enemizer(world, player, rom, args.rom, args.enemizercli, args.shufflepots[player], sprite_random_on_hit)
if not args.jsonout:
rom = LocalRom.fromJsonRom(rom, args.rom, 0x400000)
else:
logging.warning("EnemizerCLI not found at:" + args.enemizercli)
logging.warning("No Enemizer options will be applied until this is resolved.")
if args.race:
patch_race_rom(rom)