Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Repeatable item token fixes #121

Merged
merged 2 commits into from
Dec 31, 2024
Merged

Repeatable item token fixes #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9bac83
RepeatItemOnTokenFixes
Tacoman369 Dec 30, 2024
e32af1b
update z3dr
Tacoman369 Dec 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Z3DR
Open in desktop
Submodule Z3DR updated 2 files
+2 −1 code/source/rnd/item_override.cpp
+2 −1 code/source/rnd/models.cpp
71 changes: 49 additions & 22 deletions source/fill.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ static void AssumedFill(const std::vector<ItemKey>& items, const std::vector<Loc
LocationKey selectedLocation = RandomElement(accessibleLocations);
if ( !(Location(selectedLocation)->IsRepeatable()) && ItemTable(item).IsReusable() ){
//unsuccessfulPlacement = true;
// CitraPrint("Attemting to place repeatable item in non repeatable spot in AssumedFill");
CitraPrint("Attemting to place repeatable item in non repeatable spot in AssumedFill");
PlacementLog_Msg("\n Attempted to place " + ItemTable(item).GetName().GetEnglish() + " at " + Location(selectedLocation)->GetName());
itemsToPlace.push_back(item);
}
Expand Down Expand Up @@ -650,16 +650,17 @@ static void RandomizeDungeonItems() {

}

const std::array<ItemKey, 4> dungeonRewards = {
ODOLWAS_REMAINS,
GOHTS_REMAINS,
GYORGS_REMAINS,
TWINMOLDS_REMAINS,
//MAJORAS_MASK,
}; for (ItemKey item : dungeonRewards) {
CitraPrint("Rewards:\n");
CitraPrint(ItemTable(item).GetName().GetEnglish() + "\n");
}
const std::array<ItemKey, 4> dungeonRewards = {
ODOLWAS_REMAINS,
GOHTS_REMAINS,
GYORGS_REMAINS,
TWINMOLDS_REMAINS,
//MAJORAS_MASK,
};
//for (ItemKey item : dungeonRewards) {
// CitraPrint("Rewards:\n");
// CitraPrint(ItemTable(item).GetName().GetEnglish() + "\n");
// }
//CitraPrint("About to start attempting Reward Shuffle Any Dungeon");
if (ShuffleRewards.Is((u8)RewardShuffleSetting::REWARDSHUFFLE_ANY_DUNGEON)) {
AddElementsToPool(anyDungeonItems, dungeonRewards);
Expand Down Expand Up @@ -796,7 +797,7 @@ int Fill() {

showItemProgress = true;

//Place dungeon rewards - always vanilla for now
//Place dungeon rewards
RandomizeDungeonRewards();

//Place dungeon items restricted to their Own Dungeon
Expand All @@ -814,7 +815,32 @@ int Fill() {

AssumedFill(gfItems, gfLocations, true);
}

//Then if repeatable items on tokens is off -- fill token spots with nonrepeatable items
if (Tokensanity && !RepeatableItemsOnTokens){
//Get all nonrepeatable items
std::vector<ItemKey> remainingNonRepeatItemPool = FilterAndEraseFromPool(ItemPool, [](const ItemKey i) {return ItemTable(i).IsReusable() == false;});
std::vector<LocationKey> SwampSkullLocations = FilterFromPool(allLocations, [](const LocationKey loc) {return Location(loc)->IsCategory(Category::cSwampSkulltula);});
//CitraPrint("Starting Assumed Fill on Swamp Locations");
//fill skulltula spots with them
FastFill(remainingNonRepeatItemPool, SwampSkullLocations);

std::vector<LocationKey> OceanSkullLocations = FilterFromPool(allLocations, [](const LocationKey loc1) {return Location(loc1)->IsCategory(Category::cOceanSkulltula);});
//CitraPrint("Starting Assumed Fill on Ocean Locations");
FastFill(remainingNonRepeatItemPool, OceanSkullLocations);

//CitraPrint("Adding RemainingNonRepeatItems back to main ItemPool");
AddElementsToPool(ItemPool, remainingNonRepeatItemPool);
//Then Place Anju & Kafei Items in spots accessable on Day 1, this should prevent situations where you cant get an item in time for its use
std::vector<LocationKey> day1Locations = FilterFromPool(allLocations, [](const LocationKey loc) {return Location(loc)->IsCategory(Category::cDayOne);});
std::vector<ItemKey> anjukafeiitems = FilterAndEraseFromPool(ItemPool, [](const ItemKey i) {return ItemTable(i).GetItemType() == ITEMTYPE_QUEST;});
AssumedFill(anjukafeiitems, day1Locations,true);

//get the rest of the repeatable items and fill them in -- may not be needed?
//std::vector<ItemKey> remainingRepeatItems = FilterAndEraseFromPool(ItemPool, [](const ItemKey i) {return ItemTable(i).IsReusable();});
//CitraPrint("Starting Fill of remaining Repeat Items");
//AssumedFill(remainingRepeatItems, allLocations,true);
}

//Place Main Inventory First
//So first get all items in the pool + DekuMask,
std::vector<ItemKey> mainadvancementItems = FilterAndEraseFromPool(ItemPool, [](const ItemKey i) {return ItemTable(i).IsAdvancement() && ItemTable(i).GetItemType() != ITEMTYPE_QUEST;});//(ItemTable(i).GetItemType() == ITEMTYPE_ITEM || ItemTable(i).GetItemType() == ITEMTYPE_MASK || ItemTable(i).GetItemType() == ITEMTYPE_TRADE || ItemTable(i).GetItemType() == ITEMTYPE_GFAIRY)
Expand All @@ -826,6 +852,10 @@ int Fill() {
std::vector<ItemKey> anjukafeiitems = FilterAndEraseFromPool(ItemPool, [](const ItemKey i) {return ItemTable(i).GetItemType() == ITEMTYPE_QUEST;});
AssumedFill(anjukafeiitems, day1Locations,true);

std::vector<LocationKey> repeatableItemLocations = FilterFromPool(allLocations, [](const LocationKey loc) {return Location(loc)->IsRepeatable();});
std::vector<ItemKey> remainingRepeatItemPool = FilterAndEraseFromPool(ItemPool, [](const ItemKey i) {return ItemTable(i).IsReusable();});
AssumedFill(remainingRepeatItemPool, repeatableItemLocations, true);

//Then Place Deku Merchant Items
/* if(ShuffleMerchants) {
std::vector<ItemKey> dekuTrades = FilterAndEraseFromPool(ItemPool, [](const ItemKey i) {return ItemTable(i).GetItemType() == ITEMTYPE_TRADE;});
Expand All @@ -849,25 +879,22 @@ int Fill() {
}
AssumedFill(songs, songLocations, true);
}*/






//Then place Link's Pocket Item if it has to be an advancement item
//Links Pocket is useless as there is no unobtainable check due to a certain time travel sword pedistal
//Any check that occurs before MM3D world initialization like Ocarina/KokiriSword/Shield/SongofTime
//Can just be handled by starting inventory
//RandomizeLinksPocket();


//Then place the rest of the advancement items
std::vector<ItemKey> remainingAdvancementItems = FilterAndEraseFromPool(ItemPool, [](const ItemKey i) { return ItemTable(i).IsAdvancement();});
AssumedFill(remainingAdvancementItems, allLocations, true);

//Place Tokens before junk
std::vector<ItemKey> tokens = FilterAndEraseFromPool(ItemPool, [](const ItemKey i) {return ItemTable(i).GetItemType() == ITEMTYPE_TOKEN; });
AssumedFill(tokens, allLocations, true);

// CitraPrint("Starting AssumedFill...");
//Then place the rest of the advancement items
std::vector<ItemKey> remainingAdvancementItems = FilterAndEraseFromPool(ItemPool, [](const ItemKey i) { return ItemTable(i).IsAdvancement();});
AssumedFill(remainingAdvancementItems, allLocations, true);
// CitraPrint("AssumedFill was sucessful");
// CitraPrint("Starting Fast Fill...");
//Fast fill for the rest of the pool
Expand Down
Loading
Loading