From 9a3b2f8da4265536a5afcbf86486649ae8458721 Mon Sep 17 00:00:00 2001 From: aMannus Date: Sat, 18 Oct 2025 20:20:14 +0200 Subject: [PATCH] Update triforce hunt option parsing --- soh/soh/Enhancements/randomizer/context.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp index a7cf6ebc3..d8f7ede37 100644 --- a/soh/soh/Enhancements/randomizer/context.cpp +++ b/soh/soh/Enhancements/randomizer/context.cpp @@ -716,14 +716,8 @@ void Context::ParseArchipelagoOptions() { mOptions[RSK_SHUFFLE_BOSS_ENTRANCES].Set(0); mOptions[RSK_SHUFFLE_100_GS_REWARD].Set(slotData["shuffle_100_gs_reward"]); mOptions[RSK_TRIFORCE_HUNT].Set(slotData["triforce_hunt"]); - uint16_t triforcePiecesRequired = slotData["triforce_hunt_required_pieces"]; - float triforcePiecesExtraMultiplier = 1 + (float(slotData["triforce_hunt_extra_pieces_percentage"]) / 100); - uint16_t triforcePiecesTotal = floor(triforcePiecesRequired * triforcePiecesExtraMultiplier); - if (triforcePiecesTotal > 100) { - triforcePiecesTotal = 100; - } - mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL].Set((triforcePiecesTotal - 1)); - mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED].Set((triforcePiecesRequired - 1)); + mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL].Set(slotData["triforce_hunt_pieces_total"]); + mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED].Set(slotData["triforce_hunt_pieces_required"]); mOptions[RSK_SHUFFLE_BOSS_SOULS].Set(slotData["shuffle_boss_souls"]); if (slotData["shuffle_fish"] == 0) { mOptions[RSK_FISHSANITY].Set(RO_FISHSANITY_OFF);