mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-04 02:16:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix prologue items sometimes being in excluded locations

Browse Source
This commit is contained in:
gymnast86
2026-06-01 02:07:37 -07:00
parent ba7211126c
commit dfdd5250bd
1 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dusk/randomizer/generator/logic/fill.cpp
+24 -17
View File
@@ -219,24 +219,31 @@ namespace randomizer::logic::fill
void PlacePrologueItems(std::unique_ptr<world::World>& world, world::WorldPool& worlds)
{
if (world->Setting("Skip Prologue") == "Off")
{
// Filter out the slingshot and progressive swords to place first. The first slingshot and sword have a very limited
// pool of locations and have to be found in the intro. We also include the lantern, shadow crystal, and progressive
// fishing rod because those items can lock prologue locations also.
auto& itemPool = world->GetItemPool();
auto prologueItems = utility::container::FilterAndEraseFromVector(
itemPool,
[](const auto& item)
{
return item->GetName() == "Slingshot" || item->GetName() == "Progressive Sword" ||
item->GetName() == "Lantern" || item->GetName() == "Progressive Fishing Rod" ||
item->GetName() == "North Faron Woods Gate Key" ||
item->IsShadowCrystal();
});
auto completeItemPool = item_pool::GetCompleteItemPool(worlds);
AssumedFill(worlds, prologueItems, completeItemPool, world->GetAllLocations());
if (world->Setting("Skip Prologue") == "On") {
return;
}
auto locations = world->GetAllLocations();
// Filter out excluded locations
utility::container::FilterAndEraseFromVector(locations, [](const auto& location) {
return !location->IsProgression();
});
// Filter out the slingshot and progressive swords to place first. The slingshot and first sword have a very limited
// pool of locations and have to be found in the intro. We also include the lantern, shadow crystal, and progressive
// fishing rod because those items can lock prologue locations also.
auto& itemPool = world->GetItemPool();
auto prologueItems = utility::container::FilterAndEraseFromVector(
itemPool,
[](const auto& item)
{
return item->GetName() == "Slingshot" || item->GetName() == "Progressive Sword" ||
item->GetName() == "Lantern" || item->GetName() == "Progressive Fishing Rod" ||
item->GetName() == "North Faron Woods Gate Key" ||
item->IsShadowCrystal();
});
auto completeItemPool = item_pool::GetCompleteItemPool(worlds);
AssumedFill(worlds, prologueItems, completeItemPool, locations);
}
void PlaceGoalLocationItems(std::unique_ptr<world::World>& world, world::WorldPool& worlds)