From 96dd7073e4c8497fc99f2dd35c0f547c8f71d890 Mon Sep 17 00:00:00 2001 From: briaguya <70942617+briaguya-ai@users.noreply.github.com> Date: Fri, 24 Feb 2023 02:57:31 -0500 Subject: [PATCH] always add a gossip stone hint for greg when greg bridge is enabled (#2530) * always add a gossip stone hint for greg when greg bridge is enabled * don't double loop --------- Co-authored-by: briaguya --- soh/soh/Enhancements/randomizer/3drando/hints.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp index 8a43e0aab..5028f8c89 100644 --- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp @@ -812,7 +812,9 @@ void CreateAllHints() { if (hintSetting.distTable[static_cast(HintType::Always)].copies > 0) { // Only filter locations that had a random item placed at them (e.g. don't get cow locations if shuffle cows is off) auto alwaysHintLocations = FilterFromPool(allLocations, [](const uint32_t loc){ - return Location(loc)->GetHint().GetType() == HintCategory::Always && + return ((Location(loc)->GetHint().GetType() == HintCategory::Always) || + // If we have Rainbow Bridge set to Greg, add a hint for where Greg is + (Bridge.Is(RAINBOWBRIDGE_GREG) && Location(loc)->GetPlacedItemKey() == GREG_RUPEE)) && Location(loc)->IsHintable() && !(Location(loc)->IsHintedAt()); });