Commit graph

3649 commits

Author SHA1 Message Date
xxAtrain223 2b650a4979
Stringify Randomizer Enums (#6223)
Moved randomizer enums from randomizerTypes.h to randomizerEnums.h and helpers
2026-03-02 00:58:24 +00:00
red 2c07edc4eb
Add disable jabu wobble accessibility option (#6280) 2026-03-02 00:45:17 +00:00
Philip Dubé 0a946e5b9d
Roc's Feather: avoid OOB access to gItemAgeReqs (#6297)
This fix is a bit blunt, but in the absence of a better idea it exists
2026-03-01 14:55:16 +00:00
Philip Dubé b07c64ecf9
Fix song of storms cutscene (#6310) 2026-02-28 23:51:13 +00:00
Philip Dubé a547d51abb
Fix Malon text on Lon Lon Ranch in rando (#6308)
Missed in #6299
2026-02-28 16:33:16 +00:00
Pepe20129 d841357fd4
Update libultraship (#6283) 2026-02-28 16:30:30 +00:00
Pepe20129 8dd03ef097
Trap Improvements (#6302)
* Move some trap stuff to `Traps.cpp`

* Split `GetTrapTrickModel` into a function

* Split `ShouldJunkItemBeTrap` into a function

* Move `BuildIceTrapMessage` to `Traps.cpp`

* Allow ice trap messages to have the item name. Only for english for now due to article issues.
2026-02-28 15:53:05 +00:00
Jerom Venneker a393f48c7c
Fix missable Malon check (#6299)
Added a case for the VB_MALON_RETURN_FROM_CASTLE vanilla behavior flag.
This lets Malon stay until you both get the egg and wake up Talon making the egg flag unmissable.
2026-02-28 14:57:27 +00:00
Philip Dubé 00ac1d566d
spdlog: don't pass printf format string (#6307) 2026-02-28 04:20:09 +00:00
Jeffrey Crowell fcf7d4bd15
Add CoreAudio support (#6270) 2026-02-28 03:34:29 +00:00
Jameriquiah 9f56ef5090
unsheathe without slashing (#6216) 2026-02-27 19:34:56 -07:00
Philip Dubé d46bfd9716
Avoid auto saving in file select (#6298) 2026-02-28 00:48:34 +00:00
Philip Dubé 5a7bc9a459
Remove unnecessary includes of OTRGlobals.h in actor overlays (#6306) 2026-02-28 00:44:41 +00:00
Jameriquiah 6b51909aa5
tooltip otr to o2r (#6300) 2026-02-27 14:42:45 +00:00
Philip Dubé fe5dce24b5
Misc fixes for Shuffle Climb (#6296)
Rename deku tree grass on 2F, move logic accordingly
Include climb requirement in Dodongo's Armos Room without unintuitive jumps
Spirit typo had locked door before child climb linked to 2F instead of 1F
2026-02-27 02:36:51 +00:00
Christopher Leggett c3ffaa918d
Don't autoformat altar hints twice. (#6295) 2026-02-26 23:26:52 +00:00
Philip Dubé b6cdc6c490
Fix kak backyard logic with shuffle climb (#6288)
Missed ladder to potion shop
2026-02-26 22:28:00 +00:00
Christopher Leggett d4d3e8bc0f
Port Scrolling Texture Interpolation over from 2Ship (#6224) 2026-02-26 13:36:55 +00:00
coavins c2cf154e3e
Update .vscode and .devcontainer files (#6246)
This commit makes some changes to the dockerfile to make it work again.
We install cmake from source in order to meet the minimum required
version specified in the CMakeLists.txt file. We build the same version
that is installed on the CI runner image.

We also build tinyxml2 from source because we need some cmake files
that are apparently not included in the apt package.
2026-02-26 01:24:22 +00:00
Pepper0ni 0e99b30e91
Add StartingAge limits to Closed Forest (#6282) 2026-02-21 17:50:36 +00:00
Pepper0ni 19df711123
remove castle moat spawn override (#6284) 2026-02-21 17:48:50 +00:00
Pepper0ni 0702b11b90
fix carpet man logic (#6285) 2026-02-21 17:48:15 +00:00
A Green Spoon d9ebce9f9f
hookify additional reticles (#6278) 2026-02-17 20:08:06 +00:00
Pepper0ni 4cae79fd89
Change numbered tricks in preset and settings to use codes. (#6267) 2026-02-17 16:34:38 +00:00
Philip Dubé 8e1f1aea82
Fix location list (#6276)
Base has name in Flags column, this should not be null
Omit on unknown location to match other Location::Base rows
2026-02-16 14:53:32 -07:00
Philip Dubé e987cdae24
Fix misc issues (#6275)
fix #3990 #6055 #6145 #6271
2026-02-16 17:52:31 +00:00
Philip Dubé c63f57850f
Deku Theater: better handling of timesaver being disabled for shuffle speak (#6265)
also skip first 2 seconds of scrubs deciding to pop out of ground
2026-02-16 16:21:35 +00:00
Philip Dubé b1fea3fe78
Bean Souls: don't lose flag when soul found in same location as bean patch (#6264) 2026-02-16 16:16:35 +00:00
Jordan Longstaff 0210374cc4
Enable missing music entries in audio editor (#5685)
* Enable missing music entries in audio editor

* Fix mislabeled tracks "Ocarina of Time" and "Seal of Six Sages" (mirrored in decomp)
2026-02-14 20:31:19 -07:00
anthony-barricelli d67dcb92f2
Bug Fix: Setting Start with OoT only gives Fairy Ocarina in Rando (#6227) 2026-02-15 01:19:31 +00:00
anthony-barricelli 3206425e1b
fixes #6008 (#6229) 2026-02-15 01:17:53 +00:00
Malkierian e447143e48
Fix the extractor's assumption that found files are always in the working directory (x64/build/soh). (#6243) 2026-02-14 17:51:48 -07:00
Philip Dubé e6947c733c
Business Scrubs: don't speak without jabber nut (#6255)
most speak checks conservatively only apply to Link initiating speech,
but didn't realize business scrubs speak unprompted & that would make deku jabber nut mostly useless

this doesn't apply to other scrubs (such as 123 scrubs), maybe in future we can block more, such as showing trade items
2026-02-15 00:48:00 +00:00
Philip Dubé 71c6f02a86
Big Poes hint: not Big Goron (#6256) 2026-02-15 00:36:16 +00:00
Malkierian b83ca39c98
Make tricks and locations lists re-evaluate after preset application. (#6263) 2026-02-14 15:58:26 -07:00
Pepper0ni 7eb5acf224
Fix wrong logic var in spirit shared (#6254) 2026-02-14 19:04:50 +00:00
A Green Spoon f31172c647
remove extra zf condition + add vb call (#6258) 2026-02-14 19:04:34 +00:00
Philip Dubé 1e1ba54cf6
Water Temple: fix waterfall GS logic (#6251) 2026-02-12 02:40:04 +00:00
Philip Dubé 92cb7f1594
fix crash when generating decoupled entrances with boss shuffle (#6189)
regression from ganon's tower shuffle
2026-02-10 19:22:40 +00:00
Philip Dubé 04eb8d1601
Forest: fix hover recoil trick using wrong operator (#6248) 2026-02-10 00:27:58 +00:00
anthony-barricelli 21a270c0b3
Bug Fix: MQ Dungeon setting not updating locations in Locations tab (#6228)
refresh locations if MQ dungeon setting changes + show MQ locations for "Selection Only"
2026-02-10 00:09:52 +00:00
Christopher Leggett 6a31700820
Fixes some Stone of Agony bugs and refactors it to a VB Hook (#6235)
Fixes #1727. Specifically, it removes a lot of old situations in which the stone of agony icon would've been hidden, such as shield and z-targeting. It will still be hidden while talking to an NPC or in cutscenes.

This does also introduce a subtle change in behavior. It now behaves a bit more like the Shard of Agony from the 3ds version. Instead of always being visible after the stone of agony is obtained, it is now hidden until you get close to a secret spot, appearing at a slightly further range than when the rumble would start.
2026-02-10 00:07:34 +00:00
A Green Spoon a2f2697d0d
move EndFloatWindows outside of Begin (#6242) 2026-02-09 23:44:13 +00:00
Pepper0ni 293adcf9ee
fix water level logic (#6247) 2026-02-09 23:34:33 +00:00
TheLynk 743103fbe9
Fix Logic in Deku Tree (#6244) 2026-02-08 22:20:16 +00:00
xxAtrain223 ce8dd7931c
Added StartingAgeTime to RecalculateAvailableChecks. (#6237) 2026-02-08 21:58:37 +00:00
Philip Dubé 8fd41474c1
Fix logic thinking child exiting OGC GFF leads to castle grounds, not past gate (#6207)
Also fix grotto's age redirection
2026-02-07 20:21:14 +00:00
Malkierian 2bfae47b7f
Change interior pot access to only check for viable methods. (#6233) 2026-02-07 08:41:08 -07:00
Christopher Leggett 65c7c3e4a9
Fix Heart Containers/Pieces Item Pool Calculation (#6226)
This calc ends up with 8 heart containers in the pool with the default 3 starting hearts, just like the 8 heart containers in the vanilla game. Changing starting hearts results in half of the remaining hearts being filled by heart containers and half of the remaining hearts being filled by heart pieces.
2026-02-06 02:18:06 +00:00
anthony-barricelli 2656c20f71
check if rando for quest kaleido menu panel (#6231) 2026-02-04 18:59:52 +00:00