mirror of
https://github.com/MarioSpore/Grinch-AP.git
synced 2025-10-21 12:11:33 -06:00

* Implement support for option groups. WebHost options pages still need to be updated. * Remove debug output * In-progress conversion of player-options to Jinja rendering * Support "Randomize" button without JS, transpile SCSS to CSS, include map file for later editors * Un-alphabetize options, add default group name for item/location Option classes, implement more option types * Re-flow UI generation to avoid printing rows with unsupported or invalid option types, add support for TextChoice options * Support all remaining option types * Rendering improvements and CSS fixes for prettiness * Wrap options in a form, update button styles, fix labels, disable inputs where the default is random, nuke the JS * Minor CSS tweaks, as recommended by the designer * Hide JS-required elements in noscript tag. Add JS reactivity to range, named-range, and randomize buttons. * Fix labels, add JS handling for TextChoice * Make option groups collapsable * PEP8 current option_groups progress (#2604) * Make the python more PEP8 and remove unneeded imports * remove LocationSet from `Item & Location Options` group * It's ugly, but YAML generation is working * Stop generating JSON files for player-options pages * Do not include ItemDict entries whose values are zero * Properly format yaml output * Save options when form is submitted, load options on page load * Fix options being omitted from the page if a group has an even number of options * Implement generate-game, escape option descriptions * Fix "randomize" checkboxes not properly setting YAML options to "random" * Add a separator between item/location groups and items/locations in their respective lists * Implement option presets * Fix docs to detail what actually ended up happening * implement option groups on webworld to allow dev sorting (#2616) * Force extremely long item/location/option names with no spaces to text-wrap * Fix "randomize" button being too wide in single-column display, change page header to include game name * Update preset select to read "custom" when updating form inputs. Show error message if the user doesn't input a name * Un-break weighted-options, add option group names to weighted options * Nuke weighted-options. Set up framework to rebuild it in Jinja. * Generate styles with scss, remove styles which will be replaced, add placeholders for worlds * Support Toggle, DefaultOnToggle, and Choice options in weighted-options * Implement expand/collapse without JS for worlds and option groups * Properly style set options * Implement Range and NamedRange. Also, CSS is hard. * Add support for remaining option types. JS and backend still forthcoming. * Add JS functionality for collapsing game divs, populating span values on range updates. Add <noscript> tag to warn users with JS disabled. * Support showing/hiding game divs based on range value for game * Add support for adding/deleting range rows * Save settings to localStorage on form submission * Save deleted options on form submission * Break weighted-options into a per-game page. - Break weighted-options into a per-game page - Add "advanced options" links to supported games page - Use details/summary tags on supported games, player-options, and weighted-options - Fix bug preventing previously deleted rows from being removed on page load if JS is enabled - Move route handling for options pages to options.py - Remove world handling from weighted-options * Implement loading previous settings from localStorage on page load if JS is enabled * Weighted options can now generate YAML files and single-player games * options pages now respect option visibility settings for simple and complex pages * Remove `/weighted-settings` redirect, fix weighted-options link on player-options page * Fix instance of AutoWorld not having access to proper `random` * Catch instances of frozenset along with set * Restore word-wrap in tooltips * Fix word wrap in player-options labels * Add `dedent` filter to help with formatting tooltips in player-options * Do not change the ordering of keys when printing yaml files * Move necessary import out of conditional statement * Expand only the first option group by default on both options pages * Respect option visibility when generating yaml template files * Swap to double quotes * Replace instances of `/weighted-settings` with `/weighted-options`, swap out incomplete links * Strip newlines and spaces after applying dedent filter * Fix documentation for option groups * Update site map * Update various docs * Sort OptionSet lists alphabetically * Minor style tweak * Fix extremely long text overflowing tooltips * Convert player-options to use CSS grid instead of tables * Do not display link to weighted-options page on supported games if the options page is an external link * Update worlds/AutoWorld.py Bugfix by @alwaysintreble Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com> * Fix NamedRange options not being properly set if a preset it loaded * Move option-presets route into options.py * Include preset name in YAML if not "default" and not "custom" * Removed macros for PlandoBosses and DefaultOnToggle, as they were handled by their parent classes * Fix not disabling custom inputs when the randomize button is clicked * Only sort OptionList and OptionSet valid_keys if they are unordered * Quick style fixes for player-settings to give `select` elements `text-overflow: ellipsis` and increase base size of left-column * Prevent showing a horizontal scroll bar on player-options if the browser width was beneath a certain threshold * Fix a bug in weighted-options which prevented inputting a negative value for new range inputs --------- Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com>
250 lines
9.5 KiB
HTML
250 lines
9.5 KiB
HTML
{% macro Toggle(option_name, option) %}
|
|
<table>
|
|
<tbody>
|
|
{{ RangeRow(option_name, option, "No", "false") }}
|
|
{{ RangeRow(option_name, option, "Yes", "true") }}
|
|
{{ RandomRows(option_name, option) }}
|
|
</tbody>
|
|
</table>
|
|
{% endmacro %}
|
|
|
|
{% macro DefaultOnToggle(option_name, option) %}
|
|
<!-- Toggle handles defaults properly, so we just reuse that -->
|
|
{{ Toggle(option_name, option) }}
|
|
{% endmacro %}
|
|
|
|
{% macro Choice(option_name, option) %}
|
|
<table>
|
|
<tbody>
|
|
{% for id, name in option.name_lookup.items() %}
|
|
{% if name != 'random' %}
|
|
{{ RangeRow(option_name, option, option.get_option_name(id), name) }}
|
|
{% endif %}
|
|
{% endfor %}
|
|
{{ RandomRows(option_name, option) }}
|
|
</tbody>
|
|
</table>
|
|
{% endmacro %}
|
|
|
|
{% macro Range(option_name, option) %}
|
|
<div class="hint-text js-required">
|
|
This is a range option.
|
|
<br /><br />
|
|
Accepted values:<br />
|
|
Normal range: {{ option.range_start }} - {{ option.range_end }}
|
|
{% if option.special_range_names %}
|
|
<br /><br />
|
|
The following values has special meaning, and may fall outside the normal range.
|
|
<ul>
|
|
{% for name, value in option.special_range_names.items() %}
|
|
<li>{{ value }}: {{ name }}</li>
|
|
{% endfor %}
|
|
</ul>
|
|
{% endif %}
|
|
<div class="add-option-div">
|
|
<input type="number" class="range-option-value" data-option="{{ option_name }}" />
|
|
<button class="add-range-option-button" data-option="{{ option_name }}">Add</button>
|
|
</div>
|
|
</div>
|
|
<table class="range-rows" data-option="{{ option_name }}">
|
|
<tbody>
|
|
{{ RangeRow(option_name, option, option.range_start, option.range_start, True) }}
|
|
{% if option.range_start < option.default < option.range_end %}
|
|
{{ RangeRow(option_name, option, option.default, option.default, True) }}
|
|
{% endif %}
|
|
{{ RangeRow(option_name, option, option.range_end, option.range_end, True) }}
|
|
{{ RandomRows(option_name, option) }}
|
|
</tbody>
|
|
</table>
|
|
{% endmacro %}
|
|
|
|
{% macro NamedRange(option_name, option) %}
|
|
<!-- Range is able to properly handle NamedDRange options -->
|
|
{{ Range(option_name, option) }}
|
|
{% endmacro %}
|
|
|
|
{% macro FreeText(option_name, option) %}
|
|
<div class="hint-text">
|
|
This option allows custom values only. Please enter your desired values below.
|
|
<div class="custom-value-wrapper">
|
|
<input class="custom-value" data-option="{{ option_name }}" placeholder="Custom Value" />
|
|
<button data-option="{{ option_name }}">Add</button>
|
|
</div>
|
|
<table>
|
|
<tbody>
|
|
<!-- This table to be filled by JS -->
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
{% endmacro %}
|
|
|
|
{% macro TextChoice(option_name, option) %}
|
|
<div class="hint-text">
|
|
Custom values are also allowed for this option. To create one, enter it into the input box below.
|
|
<div class="custom-value-wrapper">
|
|
<input class="custom-value" data-option="{{ option_name }}" placeholder="Custom Value" />
|
|
<button data-option="{{ option_name }}">Add</button>
|
|
</div>
|
|
</div>
|
|
<table>
|
|
<tbody>
|
|
{% for id, name in option.name_lookup.items() %}
|
|
{% if name != 'random' %}
|
|
{{ RangeRow(option_name, option, option.get_option_name(id), name) }}
|
|
{% endif %}
|
|
{% endfor %}
|
|
{{ RandomRows(option_name, option) }}
|
|
</tbody>
|
|
</table>
|
|
{% endmacro %}
|
|
|
|
{% macro PlandoBosses(option_name, option) %}
|
|
<!-- PlandoBosses is handled by its parent, TextChoice -->
|
|
{{ TextChoice(option_name, option) }}
|
|
{% endmacro %}
|
|
|
|
{% macro ItemDict(option_name, option, world) %}
|
|
<div class="dict-container">
|
|
{% for item_name in world.item_names|sort %}
|
|
<div class="dict-entry">
|
|
<label for="{{ option_name }}-{{ item_name }}-qty">{{ item_name }}</label>
|
|
<input
|
|
type="number"
|
|
id="{{ option_name }}-{{ item_name }}-qty"
|
|
name="{{ option_name }}||{{ item_name }}"
|
|
value="0"
|
|
/>
|
|
</div>
|
|
{% endfor %}
|
|
</div>
|
|
{% endmacro %}
|
|
|
|
{% macro OptionList(option_name, option) %}
|
|
<div class="list-container">
|
|
{% for key in option.valid_keys|sort %}
|
|
<div class="list-entry">
|
|
<input
|
|
type="checkbox"
|
|
id="{{ option_name }}-{{ key }}"
|
|
name="{{ option_name }}||{{ key }}"
|
|
value="1"
|
|
/>
|
|
<label for="{{ option_name }}-{{ key }}">
|
|
{{ key }}
|
|
</label>
|
|
</div>
|
|
{% endfor %}
|
|
</div>
|
|
{% endmacro %}
|
|
|
|
{% macro LocationSet(option_name, option, world) %}
|
|
<div class="set-container">
|
|
{% for group_name in world.location_name_groups.keys()|sort %}
|
|
{% if group_name != "Everywhere" %}
|
|
<div class="set-entry">
|
|
<input type="checkbox" id="{{ option_name }}-{{ group_name }}" name="{{ option_name }}||{{ group_name }}" value="1" {{ "checked" if grop_name in option.default }} />
|
|
<label for="{{ option_name }}-{{ group_name }}">{{ group_name }}</label>
|
|
</div>
|
|
{% endif %}
|
|
{% endfor %}
|
|
{% if world.location_name_groups.keys()|length > 1 %}
|
|
<div class="divider"> </div>
|
|
{% endif %}
|
|
{% for location_name in world.location_names|sort %}
|
|
<div class="set-entry">
|
|
<input type="checkbox" id="{{ option_name }}-{{ location_name }}" name="{{ option_name }}||{{ location_name }}" value="1" {{ "checked" if location_name in option.default }} />
|
|
<label for="{{ option_name }}-{{ location_name }}">{{ location_name }}</label>
|
|
</div>
|
|
{% endfor %}
|
|
</div>
|
|
{% endmacro %}
|
|
|
|
{% macro ItemSet(option_name, option, world) %}
|
|
<div class="set-container">
|
|
{% for group_name in world.item_name_groups.keys()|sort %}
|
|
{% if group_name != "Everything" %}
|
|
<div class="set-entry">
|
|
<input type="checkbox" id="{{ option_name }}-{{ group_name }}" name="{{ option_name }}||{{ group_name }}" value="1" {{ "checked" if group_name in option.default }} />
|
|
<label for="{{ option_name }}-{{ group_name }}">{{ group_name }}</label>
|
|
</div>
|
|
{% endif %}
|
|
{% endfor %}
|
|
{% if world.item_name_groups.keys()|length > 1 %}
|
|
<div class="set-divider"> </div>
|
|
{% endif %}
|
|
{% for item_name in world.item_names|sort %}
|
|
<div class="set-entry">
|
|
<input type="checkbox" id="{{ option_name }}-{{ item_name }}" name="{{ option_name }}||{{ item_name }}" value="1" {{ "checked" if item_name in option.default }} />
|
|
<label for="{{ option_name }}-{{ item_name }}">{{ item_name }}</label>
|
|
</div>
|
|
{% endfor %}
|
|
</div>
|
|
{% endmacro %}
|
|
|
|
{% macro OptionSet(option_name, option) %}
|
|
<div class="set-container">
|
|
{% for key in option.valid_keys|sort %}
|
|
<div class="set-entry">
|
|
<input type="checkbox" id="{{ option_name }}-{{ key }}" name="{{ option_name }}||{{ key }}" value="1" {{ "checked" if key in option.default }} />
|
|
<label for="{{ option_name }}-{{ key }}">{{ key }}</label>
|
|
</div>
|
|
{% endfor %}
|
|
</div>
|
|
{% endmacro %}
|
|
|
|
{% macro OptionTitleTd(option_name, value) %}
|
|
<td class="td-left">
|
|
<label for="{{ option_name }}||{{ value }}">
|
|
{{ option.display_name|default(option_name) }}
|
|
</label>
|
|
</td>
|
|
{% endmacro %}
|
|
|
|
{% macro RandomRows(option_name, option, extra_column=False) %}
|
|
{% for key, value in {"Random": "random", "Random (Low)": "random-low", "Random (Middle)": "random-middle", "Random (High)": "random-high"}.items() %}
|
|
{{ RangeRow(option_name, option, key, value) }}
|
|
{% endfor %}
|
|
{% endmacro %}
|
|
|
|
{% macro RangeRow(option_name, option, display_value, value, can_delete=False) %}
|
|
<tr data-row="{{ option_name }}-{{ value }}-row" data-option-name="{{ option_name }}" data-value="{{ value }}">
|
|
<td class="td-left">
|
|
<label for="{{ option_name }}||{{ value }}">
|
|
{{ display_value }}
|
|
</label>
|
|
</td>
|
|
<td class="td-middle">
|
|
<input
|
|
type="range"
|
|
id="{{ option_name }}||{{ value }}"
|
|
name="{{ option_name }}||{{ value }}"
|
|
min="0"
|
|
max="50"
|
|
{% if option.default == value %}
|
|
value="25"
|
|
{% else %}
|
|
value="0"
|
|
{% endif %}
|
|
/>
|
|
</td>
|
|
<td class="td-right">
|
|
<span id="{{ option_name }}||{{ value }}-value">
|
|
{% if option.default == value %}
|
|
25
|
|
{% else %}
|
|
0
|
|
{% endif %}
|
|
</span>
|
|
</td>
|
|
{% if can_delete %}
|
|
<td>
|
|
<span class="range-option-delete js-required" data-target="{{ option_name }}-{{ value }}-row">
|
|
❌
|
|
</span>
|
|
</td>
|
|
{% else %}
|
|
<td><!-- This td empty on purpose --></td>
|
|
{% endif %}
|
|
</tr>
|
|
{% endmacro %}
|