Merge pull request #140 from gymnast86/barren-hint-fixes

gymnast86 · web-flow · commit 2c2395bf4445 · 2025-10-15T08:38:21.000-07:00
Fix barren hint edge cases in entrance rando
diff --git a/gui/desktop/tracker/tracker.cpp b/gui/desktop/tracker/tracker.cpp
@@ -403,7 +403,7 @@ bool MainWindow::autosave_current_tracker_preferences()
     pref["show_location_logic"] = trackerPreferences.showLocationLogic;
     pref["show_nonprogress_locations"] = trackerPreferences.showNonProgressLocations;
     pref["right_click_clear_all"] = trackerPreferences.rightClickClearAll;
-    pref["clear_all_includes_dungeon_mail"] = trackerPreferences.clearAllIncludesDungeonMail;
+    pref["clear_all_includes_dependent_locations"] = trackerPreferences.clearAllIncludesDependentLocations;
     pref["override_items_color"] = trackerPreferences.overrideItemsColor;
     pref["override_locations_color"] = trackerPreferences.overrideLocationsColor;
     pref["override_stats_color"] = trackerPreferences.overrideStatsColor;
@@ -490,9 +490,14 @@ void MainWindow::load_tracker_autosave()
         trackerPreferences.rightClickClearAll = pref["right_click_clear_all"].as<bool>();
     }
 
-    if (pref["clear_all_includes_dungeon_mail"])
+    if (pref["clear_all_includes_dependent_locations"])
     {
-        trackerPreferences.clearAllIncludesDungeonMail = pref["clear_all_includes_dungeon_mail"].as<bool>();
+        trackerPreferences.clearAllIncludesDependentLocations = pref["clear_all_includes_dependent_locations"].as<bool>();
+    }
+    // Old name for above setting
+    else if (pref["clear_all_includes_dungeon_mail"])
+    {
+        trackerPreferences.clearAllIncludesDependentLocations = pref["clear_all_includes_dungeon_mail"].as<bool>();
     }
 
     if (!std::filesystem::exists(trackerPreferences.autosaveFilePath) || !std::filesystem::exists(Utility::get_app_save_path() / "tracker_preferences.yaml"))
@@ -1352,21 +1357,12 @@ void MainWindow::tracker_clear_specific_area(const std::string& areaPrefix)
     for (auto loc : areaLocations[areaPrefix])
     {
         loc->marked = true;
-        // Clear certain mail locations associated with bosses
-        if (trackerPreferences.clearAllIncludesDungeonMail)
+        // Clear any outside dependent locations of this area
+        if (trackerPreferences.clearAllIncludesDependentLocations)
         {
-            if (loc->getName() == "Forsaken Fortress - Helmaroc King Heart Container")
-            {
-                trackerWorld.locationTable["Mailbox - Letter from Aryll"]->marked = true;
-                trackerWorld.locationTable["Mailbox - Letter from Tingle"]->marked = true;
-            }
-            else if (loc->getName() == "Forbidden Woods - Kalle Demos Heart Container")
-            {
-                trackerWorld.locationTable["Mailbox - Letter from Orca"]->marked = true;
-            }
-            else if (loc->getName() == "Earth Temple - Jalhalla Heart Container")
+            for (auto outsideLoc : loc->outsideDependentLocations)
             {
-                trackerWorld.locationTable["Mailbox - Letter from Baito"]->marked = true;
+                outsideLoc->marked = true;
             }
         }
     }
diff --git a/gui/desktop/tracker/tracker_preferences.hpp b/gui/desktop/tracker/tracker_preferences.hpp
@@ -9,7 +9,7 @@ struct TrackerPreferences {
     bool showLocationLogic = true;
     bool showNonProgressLocations = false;
     bool rightClickClearAll = true;
-    bool clearAllIncludesDungeonMail = true;
+    bool clearAllIncludesDependentLocations = true;
     bool overrideItemsColor = false;
     bool overrideLocationsColor = false;
     bool overrideStatsColor = false;
diff --git a/gui/desktop/tracker/tracker_preferences_dialog.cpp b/gui/desktop/tracker/tracker_preferences_dialog.cpp
@@ -11,7 +11,7 @@ TrackerPreferencesDialog::TrackerPreferencesDialog(MainWindow* main_) : main(mai
     ui.show_location_logic->setChecked(main->trackerPreferences.showLocationLogic);
     ui.show_nonprogress_locations->setChecked(main->trackerPreferences.showNonProgressLocations);
     ui.right_click_to_clear_all->setChecked(main->trackerPreferences.rightClickClearAll);
-    ui.clear_all_includes_dungeon_mail->setChecked(main->trackerPreferences.clearAllIncludesDungeonMail);
+    ui.clear_all_includes_dependent_locations->setChecked(main->trackerPreferences.clearAllIncludesDependentLocations);
     ui.override_items_background_color->setChecked(main->trackerPreferences.overrideItemsColor);
     ui.override_locations_background_color->setChecked(main->trackerPreferences.overrideLocationsColor);
     ui.override_statistics_background_color->setChecked(main->trackerPreferences.overrideStatsColor);
@@ -58,9 +58,9 @@ void TrackerPreferencesDialog::on_right_click_to_clear_all_stateChanged(int arg1
 }
 
 
-void TrackerPreferencesDialog::on_clear_all_includes_dungeon_mail_stateChanged(int arg1)
+void TrackerPreferencesDialog::on_clear_all_includes_dependent_locations_stateChanged(int arg1)
 {
-    main->trackerPreferences.clearAllIncludesDungeonMail = arg1;
+    main->trackerPreferences.clearAllIncludesDependentLocations = arg1;
 }
 
 
diff --git a/gui/desktop/tracker/tracker_preferences_dialog.hpp b/gui/desktop/tracker/tracker_preferences_dialog.hpp
@@ -16,7 +16,7 @@ private slots:
     void on_show_location_logic_stateChanged(int arg1);
     void on_show_nonprogress_locations_stateChanged(int arg1);
     void on_right_click_to_clear_all_stateChanged(int arg1);
-    void on_clear_all_includes_dungeon_mail_stateChanged(int arg1);
+    void on_clear_all_includes_dependent_locations_stateChanged(int arg1);
     void on_override_items_background_color_stateChanged(int arg1);
     void on_override_locations_background_color_stateChanged(int arg1);
     void on_override_statistics_background_color_stateChanged(int arg1);
diff --git a/gui/desktop/tracker/tracker_preferences_dialog.ui b/gui/desktop/tracker/tracker_preferences_dialog.ui
@@ -82,9 +82,9 @@
     </widget>
    </item>
    <item>
-    <widget class="QCheckBox" name="clear_all_includes_dungeon_mail">
+    <widget class="QCheckBox" name="clear_all_includes_dependent_locations">
      <property name="text">
-      <string>Clear All Includes Dungeon Mail</string>
+      <string>Clear All Includes Dependent Locations</string>
      </property>
     </widget>
    </item>
diff --git a/logic/Dungeon.cpp b/logic/Dungeon.cpp
@@ -1,5 +1,7 @@
 
 #include "Dungeon.hpp"
+#include "Location.hpp"
+
 #include <unordered_set>
 
 // Helper function to make sure there are no dungeon name typos
@@ -19,3 +21,17 @@ bool isValidDungeon(const std::string& dungeonName)
 
     return dungeonNames.contains(dungeonName);
 }
+
+// Gather any outside dependent locations for any locations within the dungeon
+std::list<Location*> Dungeon::getOutsideDependentLocations() const
+{
+    std::list<Location*> outsideLocs = {};
+    for (auto loc : locations) 
+    {
+        for (auto outsideLoc : loc->outsideDependentLocations)
+        {
+            outsideLocs.push_back(outsideLoc);
+        }
+    }
+    return outsideLocs;
+}
diff --git a/logic/Dungeon.hpp b/logic/Dungeon.hpp
@@ -16,7 +16,6 @@ struct Dungeon {
     Item map = Item();
     Item compass = Item();
     std::list<Location*> locations = {};
-    std::list<Location*> outsideDependentLocations = {}; // Locations which depend on beating the dungeon
     Location* raceModeLocation = nullptr;
     Area* startingArea = nullptr;
     Entrance* startingEntrance = nullptr;
@@ -30,6 +29,8 @@ struct Dungeon {
     std::string savewarpStage = "";
     uint8_t savewarpRoom = 0;
     uint8_t savewarpSpawn = 0;
+
+    std::list<Location*> getOutsideDependentLocations() const;
 };
 
 bool isValidDungeon(const std::string& dungeonName);
diff --git a/logic/Fill.cpp b/logic/Fill.cpp
@@ -437,6 +437,16 @@ static FillError randomizeOwnDungeon(WorldPool& worlds, ItemPool& itemPool)
             // Place small keys and big keys first since they're progression items
             FILL_ERROR_CHECK(assumedFill(worlds, dungeonPool, itemPool, dungeonLocations, worldId));
 
+            // Set any locations which got the keys as having expected items
+            for (auto loc : dungeonLocations)
+            {
+                if ((dungeon.smallKey.isValidItem() && loc->currentItem == dungeon.smallKey && settings.dungeon_small_keys == PlacementOption::OwnDungeon) || 
+                    (dungeon.bigKey.isValidItem() && loc->currentItem == dungeon.bigKey && settings.dungeon_big_keys == PlacementOption::OwnDungeon)) 
+                {
+                    loc->hasExpectedItem = true;
+                }
+            }
+
             // Place maps and compasses after since they aren't progressive items
             dungeonPool.clear();
             if (settings.dungeon_maps_compasses == PlacementOption::OwnDungeon)
@@ -636,6 +646,13 @@ static FillError placeRaceModeItems(WorldPool& worlds, ItemPool& itemPool, Locat
     // Then place the items in the race mode locations
     FillError err;
     FILL_ERROR_CHECK(assumedFill(worlds, raceModeItems, itemPool, raceModeLocations));
+
+    // Set race mode locations which had items placed at them as having expected items
+    for (auto raceModeLoc : raceModeLocations)
+    {
+        raceModeLoc->hasExpectedItem = true;
+    }
+
     // Recalculate major items since new items may now be required depending on
     // what items were placed at race mode locations
     determineMajorItems(worlds, itemPool, allLocations);
@@ -775,6 +792,7 @@ void clearWorlds(WorldPool& worlds)
             if (!location->plandomized && !location->hasKnownVanillaItem)
             {
                 location->currentItem = {GameItem::INVALID, nullptr};
+                location->hasExpectedItem = false;
             }
         }
     }
diff --git a/logic/Hints.cpp b/logic/Hints.cpp
@@ -193,9 +193,8 @@ static HintError calculatePossibleBarrenRegions(WorldPool& worlds)
         // count as being part of the island.
         for (auto& [name, location] : world.locationTable)
         {
-            // Locations which have known items should not block a region from being barren
-            if (location->progression && !location->hasKnownVanillaItem &&
-              !(location->isRaceModeLocation && world.getSettings().progression_dungeons != ProgressionDungeons::Disabled))
+            // Locations which have known vanilla/expected items should not block a region from being barren
+            if (location->progression && !location->hasKnownVanillaItem && !location->hasExpectedItem)
             {
                 for (auto& locAccess : location->accessPoints)
                 {
@@ -216,33 +215,20 @@ static HintError calculatePossibleBarrenRegions(WorldPool& worlds)
                                 {
                                     LOG_TO_DEBUG("Removed " + hintRegion + " from barren pool due to item " + location->currentItem.getName() + " at location " + location->getName());
                                     world.barrenRegions.erase(hintRegion);
+                                    continue;
                                 }
-                            }
-                        }
-                    }
-                }
-            }
-        }
 
-        // If a dungeon is barren, but has a non-junk item at any of it's
-        // outside dependent locations, then it shouldn't be considered barren
-        for (auto& [dungeonName, dungeon] : world.dungeons)
-        {
-            if (world.barrenRegions.contains(dungeonName))
-            {
-                for (auto loc : dungeon.outsideDependentLocations)
-                {
-                    if (!loc->currentItem.canBeInBarrenRegion())
-                    {
-                        LOG_TO_DEBUG(dungeonName + " removed from barren pool due to " + loc->currentItem.getName() + " at outside location " + loc->getName());
-                        world.barrenRegions.erase(dungeonName);
-                        // Also remove any islands this dungeon is on from the barren pool
-                        for (const auto& island : dungeon.islands)
-                        {
-                            if (world.barrenRegions.contains(island))
-                            {
-                                LOG_TO_DEBUG(island + " removed from barren pool due to " + loc->currentItem.getName() + " at outside location " + loc->getName());
-                                world.barrenRegions.erase(island);
+                                // Also make sure the outside dependent locations are barren a well
+                                for (auto outsideLoc : location->outsideDependentLocations)
+                                {
+                                    // If an outside dependent location is not barren, remove the region from being barren
+                                    if (!outsideLoc->currentItemCanBeBarren())
+                                    {
+                                        LOG_TO_DEBUG("Removed " + hintRegion + " from barren pool due to item " + outsideLoc->currentItem.getName() + " at location " + outsideLoc->getName() + " which is dependent on " + location->getName());
+                                        world.barrenRegions.erase(hintRegion);
+                                        break;
+                                    }
+                                }
                             }
                         }
                     }
@@ -359,14 +345,10 @@ static HintError generatePathHintLocations(World& world, std::vector<Location*>&
 
         auto possiblePathLocations = goalLocation->pathLocations;
 
-        // Filter out race mode locations, known vanilla items, and known
-        // keys in dungeons from possible path locations
+        // Filter out known vanilla items, and expected items
         filterAndEraseFromPool(possiblePathLocations, [settings = world.getSettings()](auto location){
             auto& item = location->currentItem;
-            return (location->hasKnownVanillaItem ||
-                   (item.isSmallKey()  && settings.dungeon_small_keys == PlacementOption::OwnDungeon) ||
-                   (item.isBigKey()    && settings.dungeon_big_keys   == PlacementOption::OwnDungeon) ||
-                   (location->isRaceModeLocation));
+            return (location->hasKnownVanillaItem || location->hasExpectedItem);
         });
 
         auto hintLocation = getHintableLocation(possiblePathLocations);
@@ -535,11 +517,9 @@ static HintError generateItemHintLocations(World& world, std::vector<Location*>&
         if (location->progression              &&  // if the location is a progression location...
            !location->currentItem.isJunkItem() &&  // and does not have a junk item...
            !location->hasKnownVanillaItem      &&  // and does not have a known vanilla item...
+           !location->hasExpectedItem          &&  // and does not have an expected item
            !location->hasBeenHinted            &&  // and has not been hinted at yet...
-          (!location->currentItem.isSmallKey() || settings.dungeon_small_keys != PlacementOption::OwnDungeon) && // and isn't a small key when small keys are in their own dungeon
-          (!location->currentItem.isBigKey()   || settings.dungeon_big_keys   != PlacementOption::OwnDungeon) && // and isn't a big key when big keys are in their own dungeon
-          (!location->isRaceModeLocation || settings.progression_dungeons == ProgressionDungeons::Disabled)   && // and isn't a race mode location when race mode/require bosses is enabled...
-          ( location->hintPriority != "Always" || !world.getSettings().use_always_hints))                        // and the hint priority is not "Always" when we're using always hints...
+           (location->hintPriority != "Always" || !world.getSettings().use_always_hints)) // and the hint priority is not "Always" when we're using always hints...
            {
               // Then the item is a possible item hint location
               possibleItemHintLocations.push_back(location.get());
diff --git a/logic/Location.hpp b/logic/Location.hpp
@@ -75,6 +75,7 @@ class Location
     bool plandomized;
     bool hasBeenHinted;
     bool hasKnownVanillaItem;
+    bool hasExpectedItem;
     bool hasDungeonDependency;
     Item originalItem;
     Item currentItem;
@@ -88,6 +89,9 @@ class Location
     std::unordered_set<GameItem> itemsInComputedRequirement = {};
     std::vector<Location*> pathLocations = {};
 
+    // Locations which always require completing this one first regardless of what item it has
+    std::list<Location*> outsideDependentLocations = {};
+
     // Variables used for the searching algorithm
     bool hasBeenFound = false;
 
@@ -113,6 +117,7 @@ class Location
         plandomized(false),
         hasBeenHinted(false),
         hasKnownVanillaItem(false),
+        hasExpectedItem(false),
         hasDungeonDependency(false),
         originalItem(GameItem::INVALID, nullptr),
         currentItem(GameItem::INVALID, nullptr),
diff --git a/logic/World.cpp b/logic/World.cpp
@@ -431,54 +431,6 @@ World::WorldLoadingError World::setDungeonLocations(WorldPool& worlds)
         }
     }
 
-    // Also set each dungeon's outsideDependentLocations.
-    // To do this, we'll disconnect all entrances into
-    // each dungeon and test to see which locations are
-    // not available without entering the dungeon
-    for (auto& [dungeonName, dungeon] : dungeons)
-    {
-        // Disconnect any entrances into this dungeon
-        std::unordered_map<Entrance*, Area*> disconnectedEntrances = {};
-        for (auto& [name, area] : areaTable)
-        {
-            for (auto& entrance : area->exits)
-            {
-                if (entrance.getConnectedArea() && entrance.getConnectedArea()->dungeon == dungeonName)
-                {
-                    disconnectedEntrances[&entrance] = entrance.disconnect();
-                }
-            }
-        }
-
-        // Get locations which are now accessible
-        ItemPool itemPool;
-        GET_COMPLETE_ITEM_POOL(itemPool, worlds)
-
-        // If the race mode location already has an item at it because of plandomizer, collect the item
-        if (dungeon.raceModeLocation->currentItem.getGameItemId() != GameItem::INVALID)
-        {
-            itemPool.push_back(dungeon.raceModeLocation->currentItem);
-        }
-
-        auto accessibleLocations = search(SearchMode::AccessibleLocations, worlds, itemPool);
-
-        // Set unaccessible progression locations as outside dependent
-        for (auto& [locName, location] : locationTable)
-        {
-            if (!elementInPool(location.get(), accessibleLocations) && !elementInPool(location.get(), dungeon.locations) && location->progression)
-            {
-                LOG_TO_DEBUG(locName + " is now an outside dependent location of dungeon " + dungeonName);
-                dungeon.outsideDependentLocations.push_back(location.get());
-            }
-        }
-
-        // Reconnect disconnected entrances
-        for (auto& [entrance, area] : disconnectedEntrances)
-        {
-            entrance->connect(area);
-        }
-    }
-
     return WorldLoadingError::NONE;
 }
 
@@ -517,7 +469,9 @@ World::WorldLoadingError World::determineRaceModeDungeons(WorldPool& worlds)
                 for (const auto& dungeon : dungeonPool)
                 {
                     auto allDungeonLocations = dungeon.locations;
-                    addElementsToPool(allDungeonLocations, dungeon.outsideDependentLocations);
+                    // Add any outside dependent locations from this dungeon's locations
+                    auto outsideLocs = dungeon.getOutsideDependentLocations();
+                    allDungeonLocations.insert(allDungeonLocations.end(), outsideLocs.begin(), outsideLocs.end());
                     for (auto dungeonLocation : allDungeonLocations)
                     {
                         if (plandomizer.locations.contains(dungeonLocation) && !plandomizer.locations[dungeonLocation].isJunkItem())
@@ -591,7 +545,7 @@ World::WorldLoadingError World::determineRaceModeDungeons(WorldPool& worlds)
 
                     // Also set any progress locations outside the dungeon which
                     // are dependent on accessing it as non-progression locations
-                    for (auto location : dungeon.outsideDependentLocations)
+                    for (auto location : dungeon.getOutsideDependentLocations())
                     {
                         if (location->progression)
                         {
@@ -783,6 +737,20 @@ World::WorldLoadingError World::loadLocation(const YAML::Node& locationObject)
         }
     }
 
+    if (locationObject["Outside Dependent Locations"])
+    {
+        for (const auto& outsideLocNode : locationObject["Outside Dependent Locations"])
+        {
+            auto locStr = outsideLocNode.as<std::string>();
+
+            // If the location hasn't been processed yet, add it
+            addLocation(locStr);
+
+            auto outsideLoc = locationTable[locStr].get();
+            location->outsideDependentLocations.push_back(outsideLoc);
+        }
+    }
+
     // Get the message label for hint locations
     if (locationObject["Message Label"])
     {
diff --git a/logic/data/location_data.yaml b/logic/data/location_data.yaml

Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,7 @@ bool MainWindow::autosave_current_tracker_preferences()`
`403`	`403`	`pref["show_location_logic"] = trackerPreferences.showLocationLogic;`
`404`	`404`	`pref["show_nonprogress_locations"] = trackerPreferences.showNonProgressLocations;`
`405`	`405`	`pref["right_click_clear_all"] = trackerPreferences.rightClickClearAll;`
`406`		`- pref["clear_all_includes_dungeon_mail"] = trackerPreferences.clearAllIncludesDungeonMail;`
	`406`	`+ pref["clear_all_includes_dependent_locations"] = trackerPreferences.clearAllIncludesDependentLocations;`
`407`	`407`	`pref["override_items_color"] = trackerPreferences.overrideItemsColor;`
`408`	`408`	`pref["override_locations_color"] = trackerPreferences.overrideLocationsColor;`
`409`	`409`	`pref["override_stats_color"] = trackerPreferences.overrideStatsColor;`
`@@ -490,9 +490,14 @@ void MainWindow::load_tracker_autosave()`
`490`	`490`	`trackerPreferences.rightClickClearAll = pref["right_click_clear_all"].as<bool>();`
`491`	`491`	`}`
`492`	`492`
`493`		`- if (pref["clear_all_includes_dungeon_mail"])`
	`493`	`+ if (pref["clear_all_includes_dependent_locations"])`
`494`	`494`	`{`
`495`		`- trackerPreferences.clearAllIncludesDungeonMail = pref["clear_all_includes_dungeon_mail"].as<bool>();`
	`495`	`+ trackerPreferences.clearAllIncludesDependentLocations = pref["clear_all_includes_dependent_locations"].as<bool>();`
	`496`	`+ }`
	`497`	`+ // Old name for above setting`
	`498`	`+ else if (pref["clear_all_includes_dungeon_mail"])`
	`499`	`+ {`
	`500`	`+ trackerPreferences.clearAllIncludesDependentLocations = pref["clear_all_includes_dungeon_mail"].as<bool>();`
`496`	`501`	`}`
`497`	`502`
`498`	`503`	`if (!std::filesystem::exists(trackerPreferences.autosaveFilePath) \|\| !std::filesystem::exists(Utility::get_app_save_path() / "tracker_preferences.yaml"))`
`@@ -1352,21 +1357,12 @@ void MainWindow::tracker_clear_specific_area(const std::string& areaPrefix)`
`1352`	`1357`	`for (auto loc : areaLocations[areaPrefix])`
`1353`	`1358`	`{`
`1354`	`1359`	`loc->marked = true;`
`1355`		`- // Clear certain mail locations associated with bosses`
`1356`		`- if (trackerPreferences.clearAllIncludesDungeonMail)`
	`1360`	`+ // Clear any outside dependent locations of this area`
	`1361`	`+ if (trackerPreferences.clearAllIncludesDependentLocations)`
`1357`	`1362`	`{`
`1358`		`- if (loc->getName() == "Forsaken Fortress - Helmaroc King Heart Container")`
`1359`		`- {`
`1360`		`- trackerWorld.locationTable["Mailbox - Letter from Aryll"]->marked = true;`
`1361`		`- trackerWorld.locationTable["Mailbox - Letter from Tingle"]->marked = true;`
`1362`		`- }`
`1363`		`- else if (loc->getName() == "Forbidden Woods - Kalle Demos Heart Container")`
`1364`		`- {`
`1365`		`- trackerWorld.locationTable["Mailbox - Letter from Orca"]->marked = true;`
`1366`		`- }`
`1367`		`- else if (loc->getName() == "Earth Temple - Jalhalla Heart Container")`
	`1363`	`+ for (auto outsideLoc : loc->outsideDependentLocations)`
`1368`	`1364`	`{`
`1369`		`- trackerWorld.locationTable["Mailbox - Letter from Baito"]->marked = true;`
	`1365`	`+ outsideLoc->marked = true;`
`1370`	`1366`	`}`
`1371`	`1367`	`}`
`1372`	`1368`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ TrackerPreferencesDialog::TrackerPreferencesDialog(MainWindow* main_) : main(mai`
`11`	`11`	`ui.show_location_logic->setChecked(main->trackerPreferences.showLocationLogic);`
`12`	`12`	`ui.show_nonprogress_locations->setChecked(main->trackerPreferences.showNonProgressLocations);`
`13`	`13`	`ui.right_click_to_clear_all->setChecked(main->trackerPreferences.rightClickClearAll);`
`14`		`- ui.clear_all_includes_dungeon_mail->setChecked(main->trackerPreferences.clearAllIncludesDungeonMail);`
	`14`	`+ ui.clear_all_includes_dependent_locations->setChecked(main->trackerPreferences.clearAllIncludesDependentLocations);`
`15`	`15`	`ui.override_items_background_color->setChecked(main->trackerPreferences.overrideItemsColor);`
`16`	`16`	`ui.override_locations_background_color->setChecked(main->trackerPreferences.overrideLocationsColor);`
`17`	`17`	`ui.override_statistics_background_color->setChecked(main->trackerPreferences.overrideStatsColor);`
`@@ -58,9 +58,9 @@ void TrackerPreferencesDialog::on_right_click_to_clear_all_stateChanged(int arg1`
`58`	`58`	`}`
`59`	`59`
`60`	`60`
`61`		`-void TrackerPreferencesDialog::on_clear_all_includes_dungeon_mail_stateChanged(int arg1)`
	`61`	`+void TrackerPreferencesDialog::on_clear_all_includes_dependent_locations_stateChanged(int arg1)`
`62`	`62`	`{`
`63`		`- main->trackerPreferences.clearAllIncludesDungeonMail = arg1;`
	`63`	`+ main->trackerPreferences.clearAllIncludesDependentLocations = arg1;`
`64`	`64`	`}`
`65`	`65`
`66`	`66`