remove suppress rom argument
This commit is contained in:
parent
d5cdff5ec9
commit
daa959e353
4
Gui.py
4
Gui.py
|
@ -428,7 +428,6 @@ def guiMain(args=None):
|
||||||
guiargs.fastmenu = rom_vars.fastMenuVar.get()
|
guiargs.fastmenu = rom_vars.fastMenuVar.get()
|
||||||
guiargs.create_spoiler = bool(createSpoilerVar.get())
|
guiargs.create_spoiler = bool(createSpoilerVar.get())
|
||||||
guiargs.skip_playthrough = not bool(createSpoilerVar.get())
|
guiargs.skip_playthrough = not bool(createSpoilerVar.get())
|
||||||
guiargs.suppress_rom = bool(suppressRomVar.get())
|
|
||||||
guiargs.open_pyramid = openpyramidVar.get()
|
guiargs.open_pyramid = openpyramidVar.get()
|
||||||
guiargs.mapshuffle = bool(mapshuffleVar.get())
|
guiargs.mapshuffle = bool(mapshuffleVar.get())
|
||||||
guiargs.compassshuffle = bool(compassshuffleVar.get())
|
guiargs.compassshuffle = bool(compassshuffleVar.get())
|
||||||
|
@ -513,7 +512,7 @@ def guiMain(args=None):
|
||||||
elif type(v) is dict: # use same settings for every player
|
elif type(v) is dict: # use same settings for every player
|
||||||
setattr(guiargs, k, {player: getattr(guiargs, k) for player in range(1, guiargs.multi + 1)})
|
setattr(guiargs, k, {player: getattr(guiargs, k) for player in range(1, guiargs.multi + 1)})
|
||||||
try:
|
try:
|
||||||
if not guiargs.suppress_rom and not os.path.exists(guiargs.rom):
|
if not os.path.exists(guiargs.rom):
|
||||||
raise FileNotFoundError(f"Could not find specified rom file {guiargs.rom}")
|
raise FileNotFoundError(f"Could not find specified rom file {guiargs.rom}")
|
||||||
if guiargs.count is not None:
|
if guiargs.count is not None:
|
||||||
seed = guiargs.seed
|
seed = guiargs.seed
|
||||||
|
@ -1204,7 +1203,6 @@ def guiMain(args=None):
|
||||||
setattr(args, k, v[1]) # only get values for player 1 for now
|
setattr(args, k, v[1]) # only get values for player 1 for now
|
||||||
# load values from commandline args
|
# load values from commandline args
|
||||||
createSpoilerVar.set(int(args.create_spoiler))
|
createSpoilerVar.set(int(args.create_spoiler))
|
||||||
suppressRomVar.set(int(args.suppress_rom))
|
|
||||||
mapshuffleVar.set(args.mapshuffle)
|
mapshuffleVar.set(args.mapshuffle)
|
||||||
compassshuffleVar.set(args.compassshuffle)
|
compassshuffleVar.set(args.compassshuffle)
|
||||||
keyshuffleVar.set(args.keyshuffle)
|
keyshuffleVar.set(args.keyshuffle)
|
||||||
|
|
1
Main.py
1
Main.py
|
@ -416,7 +416,6 @@ def main(args, seed=None):
|
||||||
pool = concurrent.futures.ThreadPoolExecutor()
|
pool = concurrent.futures.ThreadPoolExecutor()
|
||||||
multidata_task = None
|
multidata_task = None
|
||||||
check_accessibility_task = pool.submit(world.fulfills_accessibility)
|
check_accessibility_task = pool.submit(world.fulfills_accessibility)
|
||||||
if not args.suppress_rom:
|
|
||||||
|
|
||||||
rom_futures = []
|
rom_futures = []
|
||||||
mod_futures = []
|
mod_futures = []
|
||||||
|
|
|
@ -313,7 +313,6 @@ def parse_arguments(argv, no_defaults=False):
|
||||||
Alternatively, can be a ALttP Rom patched with a Link
|
Alternatively, can be a ALttP Rom patched with a Link
|
||||||
sprite that will be extracted.
|
sprite that will be extracted.
|
||||||
''')
|
''')
|
||||||
parser.add_argument('--suppress_rom', help='Do not create an output rom file.', action='store_true')
|
|
||||||
parser.add_argument('--gui', help='Launch the GUI', action='store_true')
|
parser.add_argument('--gui', help='Launch the GUI', action='store_true')
|
||||||
parser.add_argument('--progression_balancing', action='store_true', default=defval(False),
|
parser.add_argument('--progression_balancing', action='store_true', default=defval(False),
|
||||||
help="Enable Multiworld Progression balancing.")
|
help="Enable Multiworld Progression balancing.")
|
||||||
|
|
Loading…
Reference in New Issue