morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'espeon' into Archipelago_Main

Browse Source 
# Conflicts:
#	playerSettings.yaml
This commit is contained in:
Fabian Dill
2021-06-21 02:49:06 +02:00
parent 30190f373a b51b094cc1
commit 304f63aedf
11 changed files with 154 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Mystery.py
View File

@@ -590,11 +590,11 @@ def roll_alttp_settings(ret: argparse.Namespace, weights, plando_options):
setattr(ret, option_name, option(option.default))
glitches_required = get_choice('glitches_required', weights)
if glitches_required not in [None, 'none', 'no_logic', 'overworld_glitches', 'minor_glitches']:
logging.warning("Only NMG, OWG and No Logic supported")
if glitches_required not in [None, 'none', 'no_logic', 'overworld_glitches', 'hybrid_major_glitches', 'minor_glitches']:
logging.warning("Only NMG, OWG, HMG and No Logic supported")
glitches_required = 'none'
ret.logic = {None: 'noglitches', 'none': 'noglitches', 'no_logic': 'nologic', 'overworld_glitches': 'owglitches',
'minor_glitches': 'minorglitches'}[
'minor_glitches': 'minorglitches', 'hybrid_major_glitches': 'hybridglitches'}[
glitches_required]
ret.dark_room_logic = get_choice("dark_room_logic", weights, "lamp")