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

Cherry pick fix for district+shopsanity

Browse Source
This commit is contained in:
aerinon
2022-02-24 14:06:34 -07:00
committed by codemann8
parent 1eae786c43
commit 95280e8705
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Mystery.py
View File

@@ -30,6 +30,7 @@ def main():
parser.add_argument('--create_spoiler', action='store_true')
parser.add_argument('--no_race', action='store_true')
parser.add_argument('--suppress_rom', action='store_true')
parser.add_argument('--bps', action='store_true')
parser.add_argument('--rom')
parser.add_argument('--enemizercli')
parser.add_argument('--outputpath')
@@ -64,6 +65,7 @@ def main():
erargs.names = args.names
erargs.create_spoiler = args.create_spoiler
erargs.suppress_rom = args.suppress_rom
erargs.bps = args.bps
erargs.race = not args.no_race
erargs.outputname = seedname
if args.outputpath:
@@ -140,12 +142,14 @@ def roll_settings(weights):
ret.algorithm = get_choice('algorithm')
glitch_map = {'none': 'noglitches', 'no_logic': 'nologic', 'owg': 'owglitches',
'minorglitches': 'minorglitches'}
glitches_required = get_choice('glitches_required')
if glitches_required is not None:
if glitches_required not in ['none', 'owg', 'no_logic']:
print("Only NMG, OWG, and No Logic supported")
if glitches_required not in glitch_map.keys():
print(f'Logic did not match one of: {", ".join(glitch_map.keys())}')
glitches_required = 'none'
ret.logic = {'none': 'noglitches', 'owg': 'owglitches', 'no_logic': 'nologic'}[glitches_required]
ret.logic = glitch_map[glitches_required]
item_placement = get_choice('item_placement')
# not supported in ER