Skip to content

Exclude Triforce from plentiful items, add error handling #1433

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

Merged
Eblo merged 2 commits into from
Jan 4, 2026
Merged

Exclude Triforce from plentiful items, add error handling #1433

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e869c52
Exclude Triforce from plentiful, add error handling
Eblo Jan 3, 2026
1d5a92b
Add max check because unsigned
Eblo Jan 3, 2026
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
16 changes: 16 additions & 0 deletions mm/2s2h/Rando/MiscBehavior/OnFileCreate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,11 @@ void Rando::MiscBehavior::OnFileCreate(s16 fileNum) {
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 (Rando::StaticData::Items[itemPool[i]].randoItemId == RI_TRIFORCE_PIECE) {
continue;
}

switch (Rando::StaticData::Items[itemPool[i]].randoItemType) {
case RITYPE_BOSS_KEY:
case RITYPE_SMALL_KEY:
Expand Down Expand Up @@ -409,6 +414,17 @@ void Rando::MiscBehavior::OnFileCreate(s16 fileNum) {
RANDO_SAVE_OPTIONS[RO_TRIFORCE_PIECES_MAX] = piecesShuffled;
RANDO_SAVE_OPTIONS[RO_TRIFORCE_PIECES_REQUIRED] = (piecesShuffled * currentRatio) + 1;
}

if (RANDO_SAVE_OPTIONS[RO_TRIFORCE_PIECES_MAX] < 1 ||
RANDO_SAVE_OPTIONS[RO_TRIFORCE_PIECES_MAX] > 1000 ||
RANDO_SAVE_OPTIONS[RO_TRIFORCE_PIECES_REQUIRED] < 1 ||
RANDO_SAVE_OPTIONS[RO_TRIFORCE_PIECES_REQUIRED] > 1000) {
SPDLOG_ERROR("Error with adjusting Triforce Piece placement. Resulting shuffle requires {} "
"pieces and out of a total of {}",
RANDO_SAVE_OPTIONS[RO_TRIFORCE_PIECES_REQUIRED],
RANDO_SAVE_OPTIONS[RO_TRIFORCE_PIECES_MAX]);
throw std::runtime_error("Invalid Triforce Piece count");
}
}

// Grant the starting items
Expand Down
Loading