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 'main' into breaking_changes

Browse Source 
# Conflicts:
#	Adjuster.py
#	Gui.py
#	MultiClient.py
#	setup.py
#	worlds/alttp/AdjusterMain.py
#	worlds/alttp/Main.py
This commit is contained in:
Fabian Dill
2021-02-21 20:15:07 +01:00
parent 96dfccdbfc a8bace554e
commit dcce53f8c8
23 changed files with 424 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Mystery.py
View File

@@ -325,6 +325,7 @@ def roll_linked_options(weights: dict) -> dict:
def roll_triggers(weights: dict) -> dict:
weights = weights.copy() # make sure we don't write back to other weights sets in same_settings
weights["_Generator_Version"] = "Main" # Some means for triggers to know if the seed is on main or doors.
for option_set in weights["triggers"]:
try:
key = get_choice("option_name", option_set)
@@ -691,6 +692,7 @@ def roll_settings(weights: dict, plando_options: typing.Set[str] = frozenset(("b
ret.disablemusic = get_choice('disablemusic', romweights, False)
ret.quickswap = get_choice('quickswap', romweights, True)
ret.fastmenu = get_choice('menuspeed', romweights, "normal")
ret.reduceflashing = get_choice('reduceflashing', romweights, False)
ret.heartcolor = get_choice('heartcolor', romweights, "red")
ret.heartbeep = convert_to_on_off(get_choice('heartbeep', romweights, "normal"))
ret.ow_palettes = get_choice('ow_palettes', romweights, "default")