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

Merge remote-tracking branch 'origin/OverworldShuffle' into OverworldShuffle

Browse Source
This commit is contained in:
karafruit
2021-08-02 19:41:32 -07:00
parent 63bff5998b bcde69fad2
commit 3b72626f23
24 changed files with 389 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Mystery.py
View File

@@ -135,9 +135,9 @@ def roll_settings(weights):
ret.ow_shuffle = overworld_shuffle if overworld_shuffle != 'none' else 'vanilla'
overworld_swap = get_choice('overworld_swap')
ret.ow_swap = overworld_swap if overworld_swap != 'none' else 'vanilla'
ret.ow_keepsimilar = get_choice('ow_keepsimilar')
overworld_flute = get_choice('overworld_flute')
ret.ow_swap = overworld_flute if overworld_flute != 'none' else 'vanilla'
ret.ow_keepsimilar = get_choice('overworld_keepsimilar')
overworld_flute = get_choice('flute_shuffle')
ret.ow_fluteshuffle = overworld_flute if overworld_flute != 'none' else 'vanilla'
entrance_shuffle = get_choice('entrance_shuffle')
ret.shuffle = entrance_shuffle if entrance_shuffle != 'none' else 'vanilla'
door_shuffle = get_choice('door_shuffle')
@@ -186,6 +186,8 @@ def roll_settings(weights):
ret.retro = True
ret.retro = get_choice('retro') == 'on' # this overrides world_state if used
ret.bomblogic = get_choice('bomblogic') == 'on'
ret.hints = get_choice('hints') == 'on'
ret.swords = {'randomized': 'random',
@@ -239,6 +241,7 @@ def roll_settings(weights):
ret.sprite = get_choice('sprite', romweights)
ret.disablemusic = get_choice('disablemusic', romweights) == 'on'
ret.quickswap = get_choice('quickswap', romweights) == 'on'
ret.reduce_flashing = get_choice('reduce_flashing', romweights) == 'on'
ret.fastmenu = get_choice('menuspeed', romweights)
ret.heartcolor = get_choice('heartcolor', romweights)
ret.heartbeep = get_choice('heartbeep', romweights)