Merge pull request #134 from gymnast86/main

Fix fill issue when starting with or plandomizing a lot of spoils

Author: gymnast86

logic/Fill.cpp

@@ -54,17 +54,28 @@ static FillError fastFill(ItemPool& items, LocationPool& locations)
 static FillError fillTheRest(WorldPool& worlds, ItemPool& items, LocationPool& locations)
 {
     FillError err;
-    // First place the junk already in the pool
+    // First place the non consumable junk already in the pool
+    // Filter out the consumable junk to place afterwards
+    auto consumableJunk = filterAndEraseFromPool(items, [](const Item& i){return i.isConsumableJunkItem();});
     FILL_ERROR_CHECK(fastFill(items, locations));
 
-    // When the item pool is empty, get random junk for the remaining locations
+    // For the remaining locations, get items from the consumable junk. If the consumable junk runs out, just get more random
+    // consumable junk
     for (auto location : locations)
     {
         if (location->currentItem.getGameItemId() == GameItem::INVALID)
         {
-            auto item = getRandomJunk();
-            location->currentItem = location->world->getItem(item);
-            LOG_TO_DEBUG("Placed " + item + " at " + location->getName() + " in world " + std::to_string(location->world->getWorldId() + 1));
+            Item item;
+            if (!consumableJunk.empty())
+            {
+                item = popRandomElement(consumableJunk);
+            }
+            else
+            {
+                item = location->world->getItem(getRandomJunk());
+            }
+            location->currentItem = item;
+            LOG_TO_DEBUG("Placed " + item.getName() + " at " + location->getName() + " in world " + std::to_string(location->world->getWorldId() + 1));
         }
     }
     return FillError::NONE;

logic/GameItem.cpp

@@ -770,6 +770,11 @@ Item::Item(GameItem gameItemId_, World* world_) :
     gameItemId(gameItemId_),
     world(world_)
 {
+    if (junkConsumables.contains(gameItemId))
+    {
+        junkConsumable = true;
+    }
+
     if (junkItems.contains(gameItemId) || (isAnyOf(gameItemId, GameItem::HeartContainer, GameItem::PieceOfHeart) && world && world->getStartingHeartCount() >= 3))
     {
         originallyJunk = true;
@@ -891,6 +896,11 @@ bool Item::isJunkItem() const
     return junkItem;
 }
 
+bool Item::isConsumableJunkItem() const
+{
+    return junkConsumable;
+}
+
 bool Item::wasAlwaysJunkItem() const
 {
     return originallyJunk;

logic/GameItem.hpp

@@ -354,6 +354,38 @@ static const std::set<GameItem> junkItems = {
     GameItem::TinglesChart
 };
 
+static const std::set<GameItem> junkConsumables = {
+    GameItem::HeartDrop,
+    GameItem::GreenRupee,
+    GameItem::BlueRupee,
+    GameItem::YellowRupee,
+    GameItem::RedRupee,
+    GameItem::PurpleRupee,
+    GameItem::OrangeRupee,
+    GameItem::SmallMagicDrop,
+    GameItem::LargeMagicDrop,
+    GameItem::FiveBombs,
+    GameItem::TenBombs,
+    GameItem::TwentyBombs,
+    GameItem::ThirtyBombs,
+    GameItem::SilverRupee,
+    GameItem::TenArrows,
+    GameItem::TwentyArrows,
+    GameItem::ThirtyArrows,
+    GameItem::Fairy,
+    GameItem::YellowRupee2, //joke message
+    GameItem::ThreeHearts,
+    GameItem::JoyPendant,
+    GameItem::SkullNecklace,
+    GameItem::BokoBabaSeed,
+    GameItem::GoldenFeather,
+    GameItem::KnightsCrest,
+    GameItem::RedChuJelly,
+    GameItem::GreenChuJelly,
+    GameItem::AllPurposeBait,
+    GameItem::HyoiPear,
+};
+
 static const std::set<GameItem> dungeonItems = {
     GameItem::DRCSmallKey,
     GameItem::DRCBigKey,
@@ -405,6 +437,7 @@ class Item
     void setName(const std::string& language, const Text::Type& type, const std::string& name_);
     void setAsJunkItem();
     bool isJunkItem() const;
+    bool isConsumableJunkItem() const;
     bool wasAlwaysJunkItem() const;
     bool isDungeonItem() const;
     bool isMap() const;
@@ -424,6 +457,7 @@ class Item
     std::unordered_set<Location*> chainLocations = {};
     bool dungeonItem = false;
     bool junkItem = false;
+    bool junkConsumable = false;
     bool originallyJunk = false;
     World* world = nullptr; // The world that this item is *FOR*
 };