Skip to content

Fix TextChoice options sometimes creating a broken YAML #3390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 1, 2024
Merged

Fix TextChoice options sometimes creating a broken YAML #3390

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b8b256
Fix TextChoice options with custom values improperly being included i…
LegendaryLinux May 23, 2024
e95a850
Merge branch 'main' into fix-text-choice
LegendaryLinux May 23, 2024
95af455
Update WebHostLib/options.py
LegendaryLinux May 29, 2024
f8fe779
Merge branch 'main' into fix-text-choice
LegendaryLinux May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion WebHostLib/options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,16 +169,23 @@ def generate_yaml(game: str):
else:
options[key] = val

# Detect and build ItemDict options from their name pattern
for key, val in options.copy().items():
key_parts = key.rsplit("||", 2)
# Detect and build ItemDict options from their name pattern
if key_parts[-1] == "qty":
if key_parts[0] not in options:
options[key_parts[0]] = {}
if val != "0":
options[key_parts[0]][key_parts[1]] = int(val)
del options[key]

# Detect keys which end with -custom, indicating a TextChoice with a possible custom value
elif key_parts[-1].endswith("-custom"):
if val:
options[key_parts[-1][:-7]] = val

del options[key]

# Detect random-* keys and set their options accordingly
for key, val in options.copy().items():
if key.startswith("random-"):
Expand Down