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 'pull/5'

Browse Source 
# Conflicts:
#	MultiClient.py
#	MultiServer.py
#	Mystery.py
This commit is contained in:
Fabian Dill
2020-01-18 14:41:11 +01:00
parent 2ff2b5b30c 7f800de8d0
commit 72c33a2348
10 changed files with 204 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Mystery.py
View File

@@ -152,13 +152,14 @@ def roll_settings(weights):
entrance_shuffle = get_choice('entrance_shuffle')
ret.shuffle = entrance_shuffle if entrance_shuffle != 'none' else 'vanilla'
goal = get_choice('goals')
ret.goal = {'ganon': 'ganon',
'fast_ganon': 'crystals',
'dungeons': 'dungeons',
'pedestal': 'pedestal',
'triforce-hunt': 'triforcehunt'
}[get_choice('goals')]
ret.openpyramid = ret.goal == 'crystals'
}[goal]
ret.openpyramid = goal == 'fast_ganon'
ret.crystals_gt = get_choice('tower_open')