Change Boss Item Pool

- Pick from all major items when placing boss rewards instead of starting with triforce shards/swords/bows
- Allow Old Man Ho Ho's triforce hints to hint boss items since they no longer prioritize shards

Author: SuperDude88

gui/desktop/option_descriptions.hpp

@@ -125,7 +125,7 @@ static std::unordered_map<std::string, std::string> optionDescriptions = {
     },
     {
       "required_boss_items",
-      "Required dungeon bosses will drop required items (e.g. Triforce Shards). Applies to \"Standard\" and \"Race Mode\" dungeons.",
+      "Required dungeon bosses will drop major items. Applies to \"Standard\" and \"Race Mode\" dungeons.",
     },
     {
       "randomize_charts",

gui/wiiu/OptionActions.cpp

@@ -1359,7 +1359,7 @@ std::pair<std::string, std::string> getNameDesc(const Option& option) {
 
         {RemoveSwords,                {"Remove Swords",                       "Controls whether swords will be placed throughout the game."}},
         {NumRequiredDungeons,         {"Number of Required Bosses",           "Select the number of randomly-chosen bosses that are required. The door to Puppet Ganon will not unlock until you've defeated all of these bosses. Sectors with required bosses will be marked on the map. Applies to \"Standard\" and \"Race Mode\" dungeons."}},
-        {RequiredBossItems,           {"Require Boss Items",                  "Required dungeon bosses will drop required items (e.g. Triforce Shards). Applies to \"Standard\" and \"Race Mode\" dungeons."}},
+        {RequiredBossItems,           {"Require Boss Items",                  "Required dungeon bosses will drop major items. Applies to \"Standard\" and \"Race Mode\" dungeons."}},
         {RandomCharts,                {"Randomize Charts",                    "Randomizes which sector is drawn on each Triforce/Treasure Chart."}},
         {CTMC,                        {"Chest Type Matches Contents",         "Changes the chest type to reflect its contents. A metal chest has a progress item, a key chest has a dungeon key, and a wooden chest has a non-progress item or a consumable.\nKey chests are dark wood chests that use a custom texture based on Big Key Chests. Keys for non-required dungeons in race mode will be in wooden chests."}},
 

logic/Fill.cpp

@@ -622,19 +622,7 @@ static FillError placeRaceModeItems(WorldPool& worlds, ItemPool& itemPool, Locat
         }
     }
 
-    // Build up the list of race mode items starting with triforce shards...
-    auto triforceShards = filterAndEraseFromPool(itemPool, [](const Item& item){return item.isTriforceShard();});
-    generateRaceModeItems(raceModeLocations, raceModeItems,  triforceShards, itemPool);
-
-    // Then swords...
-    auto swords = filterAndEraseFromPool(itemPool, [](const Item& item){return item.getGameItemId() == GameItem::ProgressiveSword;});
-    generateRaceModeItems(raceModeLocations, raceModeItems, swords, itemPool);
-
-    // Then bows...
-    auto bows = filterAndEraseFromPool(itemPool, [](const Item& item){return item.getGameItemId() == GameItem::ProgressiveBow;});
-    generateRaceModeItems(raceModeLocations, raceModeItems, bows, itemPool);
-
-    // Then the rest of the major items if necessary.
+    // Build up the list of boss items with major items.
     auto majorItems = filterAndEraseFromPool(itemPool, [](const Item& item){return item.isMajorItem();});
     generateRaceModeItems(raceModeLocations, raceModeItems, majorItems, itemPool);
 

logic/Hints.cpp

@@ -683,7 +683,7 @@ static HintError assignHoHoHints(World& world, WorldPool& worlds, std::list<Hint
     {
         for (auto location : world.getLocations(/*onlyProgression =*/ true))
         {
-            if (location->currentItem.isTriforceShard() && !(world.getSettings().required_boss_items && location->isRaceModeLocation))
+            if (location->currentItem.isTriforceShard())
             {
                 LOG_AND_RETURN_IF_ERR(generateItemHintMessage(location, hints));
             }