mirror of
https://github.com/MarioSpore/Grinch-AP.git
synced 2025-10-21 12:11:33 -06:00
clean up imports and errors
This commit is contained in:
@@ -1,5 +1,4 @@
|
|||||||
import tkinter as tk
|
import tkinter as tk
|
||||||
import shutil
|
|
||||||
import argparse
|
import argparse
|
||||||
import logging
|
import logging
|
||||||
import random
|
import random
|
||||||
@@ -9,11 +8,11 @@ from itertools import chain
|
|||||||
from BaseClasses import MultiWorld
|
from BaseClasses import MultiWorld
|
||||||
from Options import Choice, Range, Toggle
|
from Options import Choice, Range, Toggle
|
||||||
from worlds.oot import OOTWorld
|
from worlds.oot import OOTWorld
|
||||||
from worlds.oot.Cosmetics import patch_cosmetics, format_cosmetic_option_result
|
from worlds.oot.Cosmetics import patch_cosmetics
|
||||||
from worlds.oot.Options import cosmetic_options, sfx_options
|
from worlds.oot.Options import cosmetic_options, sfx_options
|
||||||
from worlds.oot.Rom import Rom, compress_rom_file
|
from worlds.oot.Rom import Rom, compress_rom_file
|
||||||
from worlds.oot.N64Patch import apply_patch_file
|
from worlds.oot.N64Patch import apply_patch_file
|
||||||
from Utils import output_path, local_path, open_file
|
from Utils import local_path
|
||||||
|
|
||||||
logger = logging.getLogger('OoTAdjuster')
|
logger = logging.getLogger('OoTAdjuster')
|
||||||
|
|
||||||
@@ -220,6 +219,8 @@ def adjust(args):
|
|||||||
rom = Rom(file=args.vanilla_rom, force_use=True)
|
rom = Rom(file=args.vanilla_rom, force_use=True)
|
||||||
# Patch file
|
# Patch file
|
||||||
apply_patch_file(rom, args.rom)
|
apply_patch_file(rom, args.rom)
|
||||||
|
else:
|
||||||
|
raise Exception("Invalid file extension; requires .n64, .z64, .apz5")
|
||||||
# Call patch_cosmetics
|
# Call patch_cosmetics
|
||||||
patch_cosmetics(ootworld, rom)
|
patch_cosmetics(ootworld, rom)
|
||||||
# Output new file
|
# Output new file
|
||||||
|
Reference in New Issue
Block a user