monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add Toggle options back to player settings and remove unnecessary check (#1633)

This commit is contained in:
alwaysintreble 2023-03-30 15:56:26 -05:00 committed by GitHub
parent 4eea91daab
commit bf5282dfa8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
WebHostLib/options.py
View File

@ -88,7 +88,7 @@ def create():
if option_name in handled_in_js: if option_name in handled_in_js:
pass pass
elif issubclass(option, Options.Choice) or issubclass(option, Options.TextChoice): elif issubclass(option, Options.Choice) or issubclass(option, Options.Toggle):
game_options[option_name] = this_option = { game_options[option_name] = this_option = {
"type": "select", "type": "select",
"displayName": option.display_name if hasattr(option, "display_name") else option_name, "displayName": option.display_name if hasattr(option, "display_name") else option_name,
@ -97,28 +97,15 @@ def create():
"options": [] "options": []
} }
has_random_option = False
for sub_option_id, sub_option_name in option.name_lookup.items(): for sub_option_id, sub_option_name in option.name_lookup.items():
this_option["options"].append({ if sub_option_name != "random":
"name": option.get_option_name(sub_option_id), this_option["options"].append({
"value": sub_option_name, "name": option.get_option_name(sub_option_id),
}) "value": sub_option_name,
})
if sub_option_id == option.default: if sub_option_id == option.default:
this_option["defaultValue"] = sub_option_name this_option["defaultValue"] = sub_option_name
if sub_option_name == "random":
has_random_option = True
if not has_random_option:
this_option["options"].append({
"name": "random",
"value": 'random',
})
if option.default == "random":
this_option["defaultValue"] = "random"
elif issubclass(option, Options.Range): elif issubclass(option, Options.Range):
game_options[option_name] = { game_options[option_name] = {
"type": "range", "type": "range",