Skip to content
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

Dev to dev rando 4 19 #4059

Merged
merged 12 commits into from
Apr 19, 2024
Merged

Dev to dev rando 4 19 #4059

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e163d5b
Fix switch puzzle locking issues (#4027)
inspectredc Apr 7, 2024
ced34ab
[Fix] Disable Lod Applies To Everything (Macready) (#4034)
inspectredc Apr 15, 2024
0b8cc71
fix actor init flow with object loading (#3987)
Archez Apr 19, 2024
19be6e9
Trackers MQ Cleanup (#4009)
Malkierian Apr 19, 2024
32288be
Save in-game language setting (#4026)
xoascf Apr 19, 2024
bfe1390
Make equip swap work on pause any cursor (#4052)
inspectredc Apr 19, 2024
02f7310
Add keyring to check for placing Gerudo Fortess Keys in Any Dungeon o…
Malkierian Apr 19, 2024
32bf8cc
fix wii u ci (#4056)
briaguya-ai Apr 19, 2024
9696f74
Merge branch 'develop-macready' into macready-to-dev
briaguya-ai Apr 19, 2024
2216b68
fix: add include missed in merge conflict resolution
briaguya-ai Apr 19, 2024
3e32d05
macready -> dev
briaguya-ai Apr 19, 2024
f4fc366
dev -> dev-rando
Malkierian Apr 19, 2024
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
Prev Previous commit
Next Next commit
Add keyring to check for placing Gerudo Fortess Keys in Any Dungeon o… 
…r Overworld. (#4055)
  • Loading branch information
@Malkierian
Malkierian authored Apr 19, 2024
commit 02f7310c167b27befe05e4d41e7070eb8a959570
4 changes: 2 additions & 2 deletions soh/soh/Enhancements/randomizer/3drando/fill.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,10 +846,10 @@ static void RandomizeDungeonItems() {
}

if (GerudoKeys.Is(GERUDOKEYS_ANY_DUNGEON)) {
auto gerudoKeys = FilterAndEraseFromPool(ItemPool, [](const auto i) { return i == GERUDO_FORTRESS_SMALL_KEY; });
auto gerudoKeys = FilterAndEraseFromPool(ItemPool, [](const auto i) { return i == GERUDO_FORTRESS_SMALL_KEY || i == GERUDO_FORTRESS_KEY_RING; });
AddElementsToPool(anyDungeonItems, gerudoKeys);
} else if (GerudoKeys.Is(GERUDOKEYS_OVERWORLD)) {
auto gerudoKeys = FilterAndEraseFromPool(ItemPool, [](const auto i) { return i == GERUDO_FORTRESS_SMALL_KEY; });
auto gerudoKeys = FilterAndEraseFromPool(ItemPool, [](const auto i) { return i == GERUDO_FORTRESS_SMALL_KEY || i == GERUDO_FORTRESS_KEY_RING; });
AddElementsToPool(overworldItems, gerudoKeys);
}

Expand Down