monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PEP 8 format Mystery.py

This commit is contained in:
Fabian Dill 2020-09-13 17:15:49 +02:00
parent 06396b9bf2
commit 2292dbc1ce
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Mystery.py
View File

@ -50,7 +50,7 @@ def mystery_argparse():
return args return args
def main(args=None, callback = ERmain): def main(args=None, callback=ERmain):
if not args: if not args:
args = mystery_argparse() args = mystery_argparse()
@ -69,7 +69,8 @@ def main(args=None, callback = ERmain):
weights_cache[args.weights] = get_weights(args.weights) weights_cache[args.weights] = get_weights(args.weights)
except Exception as e: except Exception as e:
raise ValueError(f"File {args.weights} is destroyed. Please fix your yaml.") from e raise ValueError(f"File {args.weights} is destroyed. Please fix your yaml.") from e
print(f"Weights: {args.weights} >> {get_choice('description', weights_cache[args.weights], 'No description specified')}") print(f"Weights: {args.weights} >> "
f"{get_choice('description', weights_cache[args.weights], 'No description specified')}")
if args.meta: if args.meta:
try: try:
weights_cache[args.meta] = get_weights(args.meta) weights_cache[args.meta] = get_weights(args.meta)
@ -86,13 +87,14 @@ def main(args=None, callback = ERmain):
try: try:
if path not in weights_cache: if path not in weights_cache:
weights_cache[path] = get_weights(path) weights_cache[path] = get_weights(path)
print(f"P{player} Weights: {path} >> {get_choice('description', weights_cache[path], 'No description specified')}") print(f"P{player} Weights: {path} >> "
f"{get_choice('description', weights_cache[path], 'No description specified')}")
except Exception as e: except Exception as e:
raise ValueError(f"File {path} is destroyed. Please fix your yaml.") from e raise ValueError(f"File {path} is destroyed. Please fix your yaml.") from e
erargs = parse_arguments(['--multi', str(args.multi)]) erargs = parse_arguments(['--multi', str(args.multi)])
erargs.seed = seed erargs.seed = seed
erargs.name = {x: "" for x in range(1, args.multi + 1)} # only so it can be overwrittin in mystery erargs.name = {x: "" for x in range(1, args.multi + 1)} # only so it can be overwrittin in mystery
erargs.create_spoiler = args.create_spoiler erargs.create_spoiler = args.create_spoiler
erargs.create_diff = args.create_diff erargs.create_diff = args.create_diff
erargs.race = args.race erargs.race = args.race
@ -126,11 +128,13 @@ def main(args=None, callback = ERmain):
if self._msg != '': if self._msg != '':
self._writer(self._msg) self._writer(self._msg)
self._msg = '' self._msg = ''
log = logging.getLogger("stderr") log = logging.getLogger("stderr")
log.addHandler(logging.StreamHandler()) log.addHandler(logging.StreamHandler())
sys.stderr = LoggerWriter(log.error) sys.stderr = LoggerWriter(log.error)
os.makedirs(args.log_output_path, exist_ok=True) os.makedirs(args.log_output_path, exist_ok=True)
logging.basicConfig(format='%(message)s', level=loglevel, filename=os.path.join(args.log_output_path, f"{seed}.log")) logging.basicConfig(format='%(message)s', level=loglevel,
filename=os.path.join(args.log_output_path, f"{seed}.log"))
else: else:
logging.basicConfig(format='%(message)s', level=loglevel) logging.basicConfig(format='%(message)s', level=loglevel)
if args.rom: if args.rom:
@ -258,7 +262,8 @@ def roll_settings(weights):
if random.random() < (option_set["percentage"] / 100): if random.random() < (option_set["percentage"] / 100):
weights.update(option_set["options"]) weights.update(option_set["options"])
except Exception as e: except Exception as e:
raise ValueError(f"Linked option {option_set['name']} is destroyed. Please fix your linked option.") from e raise ValueError(f"Linked option {option_set['name']} is destroyed. "
f"Please fix your linked option.") from e
ret.name = get_choice('name', weights) ret.name = get_choice('name', weights)
if ret.name: if ret.name:
@ -269,7 +274,7 @@ def roll_settings(weights):
logging.warning("Only NMG, OWG and No Logic supported") logging.warning("Only NMG, OWG and No Logic supported")
glitches_required = 'none' glitches_required = 'none'
ret.logic = {None: 'noglitches', 'none': 'noglitches', 'no_logic': 'nologic', 'overworld_glitches': 'owglitches', ret.logic = {None: 'noglitches', 'none': 'noglitches', 'no_logic': 'nologic', 'overworld_glitches': 'owglitches',
'minor_glitches' : 'minorglitches'}[ 'minor_glitches': 'minorglitches'}[
glitches_required] glitches_required]
ret.progression_balancing = get_choice('progression_balancing', weights, True) ret.progression_balancing = get_choice('progression_balancing', weights, True)
# item_placement = get_choice('item_placement') # item_placement = get_choice('item_placement')
@ -308,8 +313,7 @@ def roll_settings(weights):
'local_ganon_triforce_hunt': 'localganontriforcehunt' 'local_ganon_triforce_hunt': 'localganontriforcehunt'
}[goal] }[goal]
# TODO consider moving open_pyramid to an automatic variable in the core roller, set to True when
#TODO consider moving open_pyramid to an automatic variable in the core roller, set to True when
# fast ganon + ganon at hole # fast ganon + ganon at hole
ret.open_pyramid = goal in {'fast_ganon', 'ganon_triforce_hunt', 'local_ganon_triforce_hunt'} ret.open_pyramid = goal in {'fast_ganon', 'ganon_triforce_hunt', 'local_ganon_triforce_hunt'}
@ -455,5 +459,6 @@ def roll_settings(weights):
ret.quickswap = True ret.quickswap = True
return ret return ret
if __name__ == '__main__': if __name__ == '__main__':
main() main()