mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-26 11:22:17 -05:00
Code Issues Projects Releases Wiki Activity

always add a gossip stone hint for greg when greg bridge is enabled (#2530)

Browse Source 
* always add a gossip stone hint for greg when greg bridge is enabled

* don't double loop

---------

Co-authored-by: briaguya <briaguya@alice>
This commit is contained in:
briaguya 2023-02-24 02:57:31 -05:00 committed by GitHub
parent 231b7eecca
commit 96dd7073e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
soh/soh/Enhancements/randomizer/3drando/hints.cpp
View File

@ -812,7 +812,9 @@ void CreateAllHints() {
if (hintSetting.distTable[static_cast<int>(HintType::Always)].copies > 0) { if (hintSetting.distTable[static_cast<int>(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) // 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){ 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()); Location(loc)->IsHintable() && !(Location(loc)->IsHintedAt());
}); });