summaryrefslogtreecommitdiff
path: root/mm/2s2h/Rando/MiscBehavior/CheckQueue.cpp
diff options
context:
space:
mode:
authorCaladius <Caladius@users.noreply.github.com>2025-10-15 12:48:06 -0400
committerGitHub <noreply@github.com>2025-10-15 12:48:06 -0400
commitc95a7739f92465d3fc2e1a4eca2912ec47c2ed3a (patch)
tree89193494f4c3b63a309b71fddfb7bede35c802f8 /mm/2s2h/Rando/MiscBehavior/CheckQueue.cpp
parentda767c966d1102fa2dfe8f78627400ab23f4634c (diff)
[Rando] Implement Triforce Hunt (#1071)
* Implement Triforce Hunt (needs Glitchless Seed Gen help) * Fix Credits Warping * Clean up logging * Fix Seed Gen * Remove test code. * Add Triforce Piece to item tracker * Allow for multiple models, pushing up because I dislike it and can't figure out a better way. * Majora Soul for Reward (needs work). Completed Triforce text * Clang * clean up comment * Remove SPDLOG * Updates based on Feedback * Cleanup * Cleanup again * Fix Ship Utils * Fix Tracker drawing * Feedback updates * clang because why not * Update to use ENTRANCE mapping. Thanks BalloonDude * Expand shuffle maximum and handle instances where a seed may not generate. * Undo menu text. * Fix Item Tracker... again and feedback changes. * Update define location to StaticData.h and update majora syntax * cleanup * Remove TriforceHunt.cpp again... * clean up * FOR REAL THIS TIME * Update ratio of required/max if the seed needs to adjust how many are in the pool due to generator issues. * clang
Diffstat (limited to 'mm/2s2h/Rando/MiscBehavior/CheckQueue.cpp')
-rw-r--r--mm/2s2h/Rando/MiscBehavior/CheckQueue.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/mm/2s2h/Rando/MiscBehavior/CheckQueue.cpp b/mm/2s2h/Rando/MiscBehavior/CheckQueue.cpp
index a9db0433f..bef7eb663 100644
--- a/mm/2s2h/Rando/MiscBehavior/CheckQueue.cpp
+++ b/mm/2s2h/Rando/MiscBehavior/CheckQueue.cpp
@@ -49,6 +49,14 @@ void Rando::MiscBehavior::CheckQueue() {
if (randoItemId == RI_JUNK) {
randoItemId = Rando::CurrentJunkItem();
}
+ if (randoItemId == RI_TRIFORCE_PIECE) {
+ if (gSaveContext.save.shipSaveInfo.rando.foundTriforcePieces + 1 >=
+ RANDO_SAVE_OPTIONS[RO_TRIFORCE_PIECES_REQUIRED]) {
+ prefix = "You";
+ message = "completed the Triforce";
+ }
+ randoItemId = RI_TRIFORCE_PIECE_PREVIOUS;
+ }
CustomMessage::Entry entry = {
.textboxType = 2,