Merge 'Fix switching from advanced to glitchless keeping tricks cached.' (#2521)

Author: cjohnson57

CHANGELOG.md

@@ -22,6 +22,7 @@
 * Fix wrong Goal hints being generated for worlds other than the first in multiworld seeds.
 * Added some missing or incorrectly named locations in advanced logic.
 * Various minor fixes for advanced logic.
+* Fix for advanced logic tricks being cached when switching to glitchless logic.
 
 ## Other Changes
 * It is no longer required to have either the goron tunic or the Fewer Tunic Requirements trick for adult to go from the Bolero warp pad to the Fire temple in logic.

Main.py

@@ -68,15 +68,22 @@ def resolve_settings(settings: Settings) -> Optional[Rom]:
 
     # compare pointers to lists rather than contents, so even if the two are identical
     # we'll still log the error and note the dist file overrides completely.
-    if old_tricks and (old_tricks is not settings.allowed_tricks
-                    or old_advanced_tricks is not settings.advanced_allowed_tricks):
+    if (old_tricks and old_tricks is not settings.allowed_tricks) or (old_advanced_tricks and old_advanced_tricks is not settings.advanced_allowed_tricks):
         logger.error('Tricks are set in two places! Using only the tricks from the distribution file.')
 
+    # flag tricks based on settings
+    # special case advanced so that if another logic is selected, all tricks are set to False
+    # this is a failsafe for disabled_default
     for trick in logic_tricks.values():
         settings.settings_dict[trick['name']] = trick['name'] in settings.allowed_tricks
 
-    for trick in advanced_logic_tricks.values():
-        settings.settings_dict[trick['name']] = trick['name'] in settings.advanced_allowed_tricks
+    if settings.logic_rules == 'advanced':
+        for trick in advanced_logic_tricks.values():
+            settings.settings_dict[trick['name']] = trick['name'] in settings.advanced_allowed_tricks
+    else:
+        for trick in advanced_logic_tricks.values():
+            settings.settings_dict[trick['name']] = False
+
 
     # we load the rom before creating the seed so that errors get caught early
     outputting_specific_world = settings.create_uncompressed_rom or settings.create_compressed_rom or settings.create_wad_file

SettingsList.py

@@ -3265,7 +3265,8 @@ class SettingInfos:
             and MAY be required to complete the game.
 
             Tricks in the left column are NEVER required.
-        '''
+        ''',
+        disabled_default = []
     )
 
     # Starting Inventory

version.py

@@ -1,4 +1,4 @@
-__version__ = '9.0.32'
+__version__ = '9.0.33'
 
 # This is a supplemental version number for branches based off of main dev.
 supplementary_version = 0