diff options
Diffstat (limited to 'mm/2s2h/Rando/Logic/GeneratePools.cpp')
| -rw-r--r-- | mm/2s2h/Rando/Logic/GeneratePools.cpp | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/mm/2s2h/Rando/Logic/GeneratePools.cpp b/mm/2s2h/Rando/Logic/GeneratePools.cpp index fa8ce7b55..2900a1a61 100644 --- a/mm/2s2h/Rando/Logic/GeneratePools.cpp +++ b/mm/2s2h/Rando/Logic/GeneratePools.cpp @@ -278,9 +278,7 @@ void GeneratePools(RandoSaveInfo& saveInfo, std::vector<RandoCheckId>& checkPool // Plentiful if (saveInfo.randoSaveOptions[RO_PLENTIFUL_ITEMS] == RO_GENERIC_YES) { - int replaceableItems = 0; std::vector<RandoItemId> plentifulItems; - std::vector<RandoItemId> potentialPlentifulItems; for (size_t i = 0; i < itemPool.size(); i++) { // The user can specify exactly how many pieces they want to shuffle, so skip those if (itemPool[i] == RI_TRIFORCE_PIECE) { @@ -295,31 +293,21 @@ void GeneratePools(RandoSaveInfo& saveInfo, std::vector<RandoCheckId>& checkPool plentifulItems.push_back(itemPool[i]); break; case RITYPE_LESSER: - case RITYPE_SKULLTULA_TOKEN: - case RITYPE_STRAY_FAIRY: - if (Ship_Random(0, 2) == 1) { - potentialPlentifulItems.push_back(itemPool[i]); + if (Rando::StaticData::Items[itemPool[i]].itemId != ITEM_TINGLE_MAP && + Rando::StaticData::Items[itemPool[i]].itemId != ITEM_DUNGEON_MAP && + Rando::StaticData::Items[itemPool[i]].itemId != ITEM_COMPASS) { + plentifulItems.push_back(itemPool[i]); } break; case RITYPE_HEALTH: case RITYPE_JUNK: default: - replaceableItems++; break; } } - if (replaceableItems > plentifulItems.size()) { - for (RandoItemId plentifulItem : plentifulItems) { - itemPool.push_back(plentifulItem); - } - } - - // Only add potentialPlentifulItems if we think we have enough room (this might not be perfect) - if ((replaceableItems - plentifulItems.size() - 10) > potentialPlentifulItems.size()) { - for (RandoItemId plentifulItem : potentialPlentifulItems) { - itemPool.push_back(plentifulItem); - } + for (RandoItemId plentifulItem : plentifulItems) { + itemPool.push_back(plentifulItem); } } |