Merge 'Better error message for conflicting settings in plando' (#1862)

OoTRandomizer · Feb 4, 2023 · 35b0a09 · 35b0a09
2 parents c031a99 + 27ba326
commit 35b0a09
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -141,6 +141,7 @@ issue. You should always Hard Reset to avoid this issue entirely.
 
 #### Plandomizer
 * Plandomizer now allows you to specify locations that are valid but do not exist in your current seed, for example, an MQ-specific location when that dungeon is Vanilla.
+* Error messages for conflicting settings have been improved.
 
 ### 7.1
 

diff --git a/SettingsList.py b/SettingsList.py
@@ -6310,9 +6310,8 @@ def validate_settings(settings_dict, *, check_conflicts=True):
 
 def validate_disabled_setting(settings_dict, setting, choice, other_setting):
     if other_setting in settings_dict:
-        disabled_default = get_setting_info(other_setting).disabled_default
-        if settings_dict[other_setting] != disabled_default:
-            raise ValueError(f'{other_setting!r} must be set to {disabled_default!r} since {setting!r} is set to {choice!r}')
+        if settings_dict[other_setting] != get_setting_info(other_setting).disabled_default:
+            raise ValueError(f'The {other_setting!r} setting cannot be used since {setting!r} is set to {choice!r}')
 
 class UnmappedSettingError(Exception):
     pass

diff --git a/version.py b/version.py
@@ -1,4 +1,4 @@
-__version__ = '7.1.35'
+__version__ = '7.1.36'
 
 # This is a supplementary version number for branches based off of main dev.
 supplementary_version = 0