Compare commits

..

2 Commits

Author SHA1 Message Date
NewSoupVi
b874b6c6d7 So much simpler 2024-06-13 06:46:01 +02:00
NewSoupVi
94ed49ae2a WeightedOptions: Fix default values that are 2 or more words 2024-06-12 23:51:05 +02:00
3 changed files with 5 additions and 11 deletions

View File

@@ -735,12 +735,6 @@ class NamedRange(Range):
elif value > self.range_end and value not in self.special_range_names.values(): elif value > self.range_end and value not in self.special_range_names.values():
raise Exception(f"{value} is higher than maximum {self.range_end} for option {self.__class__.__name__} " + raise Exception(f"{value} is higher than maximum {self.range_end} for option {self.__class__.__name__} " +
f"and is also not one of the supported named special values: {self.special_range_names}") f"and is also not one of the supported named special values: {self.special_range_names}")
# See docstring
for key in self.special_range_names:
if key != key.lower():
raise Exception(f"{self.__class__.__name__} has an invalid special_range_names key: {key}. "
f"NamedRange keys must use only lowercase letters, and ideally should be snake_case.")
self.value = value self.value = value
@classmethod @classmethod

View File

@@ -57,9 +57,9 @@
<select id="{{ option_name }}-select" data-option-name="{{ option_name }}" {{ "disabled" if option.default == "random" }}> <select id="{{ option_name }}-select" data-option-name="{{ option_name }}" {{ "disabled" if option.default == "random" }}>
{% for key, val in option.special_range_names.items() %} {% for key, val in option.special_range_names.items() %}
{% if option.default == val %} {% if option.default == val %}
<option value="{{ val }}" selected>{{ key|replace("_", " ")|title }} ({{ val }})</option> <option value="{{ val }}" selected>{{ key }} ({{ val }})</option>
{% else %} {% else %}
<option value="{{ val }}">{{ key|replace("_", " ")|title }} ({{ val }})</option> <option value="{{ val }}">{{ key }} ({{ val }})</option>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
<option value="custom" hidden>Custom</option> <option value="custom" hidden>Custom</option>

View File

@@ -19,7 +19,7 @@
{% for id, name in option.name_lookup.items() %} {% for id, name in option.name_lookup.items() %}
{% if name != 'random' %} {% if name != 'random' %}
{% if option.default != 'random' %} {% if option.default != 'random' %}
{{ RangeRow(option_name, option, option.get_option_name(id), name, False, name if option.get_option_name(option.default)|lower == name else None) }} {{ RangeRow(option_name, option, option.get_option_name(id), name, False, name if option.default == id else None) }}
{% else %} {% else %}
{{ RangeRow(option_name, option, option.get_option_name(id), name) }} {{ RangeRow(option_name, option, option.get_option_name(id), name) }}
{% endif %} {% endif %}
@@ -41,7 +41,7 @@
The following values have special meanings, and may fall outside the normal range. The following values have special meanings, and may fall outside the normal range.
<ul> <ul>
{% for name, value in option.special_range_names.items() %} {% for name, value in option.special_range_names.items() %}
<li>{{ value }}: {{ name|replace("_", " ")|title }}</li> <li>{{ value }}: {{ name }}</li>
{% endfor %} {% endfor %}
</ul> </ul>
{% endif %} {% endif %}
@@ -97,7 +97,7 @@
{% for id, name in option.name_lookup.items() %} {% for id, name in option.name_lookup.items() %}
{% if name != 'random' %} {% if name != 'random' %}
{% if option.default != 'random' %} {% if option.default != 'random' %}
{{ RangeRow(option_name, option, option.get_option_name(id), name, False, name if option.get_option_name(option.default)|lower == name else None) }} {{ RangeRow(option_name, option, option.get_option_name(id), name, False, name if option.default == id else None) }}
{% else %} {% else %}
{{ RangeRow(option_name, option, option.get_option_name(id), name) }} {{ RangeRow(option_name, option, option.get_option_name(id), name) }}
{% endif %} {% endif %}