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

Added Mystery options for OWG and Shuffle Ganon

Browse Source
This commit is contained in:
codemann8
2021-10-15 00:42:42 -05:00
parent c7c20372b4
commit 579f6c609d
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CLI.py
View File

@@ -97,7 +97,7 @@ def parse_cli(argv, no_defaults=False):
'ow_shuffle', 'ow_crossed', 'ow_keepsimilar', 'ow_mixed', 'ow_fluteshuffle', 'ow_shuffle', 'ow_crossed', 'ow_keepsimilar', 'ow_mixed', 'ow_fluteshuffle',
'shuffle', 'door_shuffle', 'intensity', 'crystals_ganon', 'crystals_gt', 'openpyramid', 'shuffle', 'door_shuffle', 'intensity', 'crystals_ganon', 'crystals_gt', 'openpyramid',
'mapshuffle', 'compassshuffle', 'keyshuffle', 'bigkeyshuffle', 'startinventory', 'mapshuffle', 'compassshuffle', 'keyshuffle', 'bigkeyshuffle', 'startinventory',
'bombbag', 'bombbag', 'shuffleganon',
'triforce_pool_min', 'triforce_pool_max', 'triforce_goal_min', 'triforce_goal_max', 'triforce_pool_min', 'triforce_pool_max', 'triforce_goal_min', 'triforce_goal_max',
'triforce_min_difference', 'triforce_goal', 'triforce_pool', 'shufflelinks', 'pseudoboots', 'triforce_min_difference', 'triforce_goal', 'triforce_pool', 'shufflelinks', 'pseudoboots',
'retro', 'accessibility', 'hints', 'beemizer', 'experimental', 'dungeon_counters', 'retro', 'accessibility', 'hints', 'beemizer', 'experimental', 'dungeon_counters',

4
Mystery.py
View File

@@ -120,7 +120,7 @@ def roll_settings(weights):
if glitches_required not in ['none', 'no_logic']: if glitches_required not in ['none', 'no_logic']:
print("Only NMG and No Logic supported") print("Only NMG and No Logic supported")
glitches_required = 'none' glitches_required = 'none'
ret.logic = {'none': 'noglitches', 'no_logic': 'nologic'}[glitches_required] ret.logic = {'none': 'noglitches', 'owg': 'owglitches', 'no_logic': 'nologic'}[glitches_required]
item_placement = get_choice('item_placement') item_placement = get_choice('item_placement')
# not supported in ER # not supported in ER
@@ -167,6 +167,8 @@ def roll_settings(weights):
}[goal] }[goal]
ret.openpyramid = goal == 'fast_ganon' if ret.shuffle in ['vanilla', 'dungeonsfull', 'dungeonssimple'] else False ret.openpyramid = goal == 'fast_ganon' if ret.shuffle in ['vanilla', 'dungeonsfull', 'dungeonssimple'] else False
ret.shuffleganon = get_choice('shuffleganon') == 'on'
ret.crystals_gt = get_choice('tower_open') ret.crystals_gt = get_choice('tower_open')
ret.crystals_ganon = get_choice('ganon_open') ret.crystals_ganon = get_choice('ganon_open')

7
mystery_example.yml
View File

@@ -48,6 +48,12 @@
full: 2 full: 2
crossed: 3 crossed: 3
insanity: 1 insanity: 1
shufflelinks:
on: 1
off: 1
shuffleganon:
on: 1
off: 1
world_state: world_state:
standard: 1 standard: 1
open: 1 open: 1
@@ -81,6 +87,7 @@
off: 1 off: 1
glitches_required: glitches_required:
none: 1 none: 1
owg: 0
no_logic: 0 no_logic: 0
accessibility: accessibility:
items: 1 items: 1