Triforce Pieces can now be tokens for bridge or ganon's soul. & can be tokens for multiple rewards
Wincon can now be arbitrary conditions
Ganon's Soul (removed from existing boss soul options) can now be arbitrary conditions
Co-authored-by: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
* Avoid `randomizer_check_tracker.h` in widely used `randomizer.h` due to transitive `libultraship.h`/`UIWidgets.hpp` inclusion
* Avoid `libultraship.h` inclusion in heavily used `GameInteractor.h` header
* Remove unused libultraship includes
* Break huge unneeded transitive include chain (via UIWidgets.hpp)
This avoids that changing just UIWidgets.hpp, for example, would retrigger a rebuild of like half the project.
There were a huge transitive include chains, mostly via MenuTypes.h and UIWidgets.hpp. Because of that, I'm splitting UIWidgets into a second header file UIWidgetOptions.hpp, which can be consumed by MenuTypes.h. MenuTypes.h is split into BackendTypes.h to avoid pulling in Fast3D/Windowing/GUI stuff into unrelated code.
Example chain, one of many:
libultraship.h <- UIWidgets.hpp <- MenuTypes.hpp <- randomizer/option.h <- randomizer/item_location.h <- trial.h <- static_data.h <- SeedContext <- (basically all randomizer related sources, lots of other sources in Enhancement, more...)
* Avoid libultraship.h in Notification.h and ObjectExtension.h; these headers are also heavily used
* Add missing include
* Remove unused libultraship includes
* Include only ship/window/GuiWindow.h in GUI-related headers instead of libultraship.h
* Cleanup ConfigUpdater.h and playthrough.cpp
* Remove libultraship.h from Anchor.h and fix transitive dependencies in OTRGlobals.cpp
* Remove unused libultraship.h includes in Anchor code
The main effect of this PR is completely decoupling OTRGlobals.h from any non-std header making it so that the "everything is being rebuilt because I changed a header that at some point gets included in OTRGlobals" problem doesn't happen anymore.
Separate options for Icicles (stalagmites and stalactites) and Red Ice. Icicles drop an item when broken and red ice gives an item when melted.
CMC options for icicles were more limited - the particle effect strobes because there are too many icicles in certain rooms. This currently uses Dampe's halo centered around the tips, which are visible for both types, but model replacement could be used here if a set was made.
Add all window display options to Entrance Tracker.
Apply hidden label filtering to combobox labels.
Remove tracker prefixes from check and entrance tracker preset load functions.
Remove all references to the menu bar, and the menubar source and header files.
* Split Fairysanity into groups
* Split fairy registration per type
* fix song fairy shuffle locations
* Change "Song Fairies" to "Fairy Spots"
* Update preset settings
* clang format
* simplify `shouldRegister` logic
* Bump LUS to include FileDropMgr's new registration system and initial cursor visibility changes.
* New LUS ref.
* Remove default on for cursor always visible.
Add option to camera controls next to enable mouse input for autocapture.
Set autocapture on startup.
* next LUS
* clang again
* Add "EnableMouse" CVar check to startup SetAutoCaptureMouse.
* Back to LUS main.
* lus version with fixes we need
* very wip
* get it building
* soh otr
* bump lus before fixing soh side stuff
* build
* still builds
* mac error
* bump otrexporter
* bump to lus main
* upstream otrexporter
---------
Co-authored-by: Malkierian <malkierian@gmail.com>
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* treesanity
co-authored-by: turbofist
* market tree at night
* NL Trees
* remove LUSLOG
* feedback
* format
* golden skulltula tree qol
* post-rebase
* trust -129
* remove tree graphic, crate csmc
* format
* feedback
* ObjectExtension
* Implement widget search exclusion.
Exclude all external windows from the search.
* Add second column to search results for non-widget results.
* Implement extra search index.
Add various controls, audio editor, and tracker options to the extra search index.
Fix capitalization on a few options.
Add click-to-view functionality to extra search column.
* Add extraSearchWidgets for searching through non-menu widgets.
Convert Controls extraSearches to widgets. Used to display in-window, as well as provide reference to extraSearchWidgets.
* Swap Audio search to menu widget search system.
* Fix missing static on a ShipInit instance.
* Implement SearchWidgets in popout windows.
Remove remaining vestiges of custom search.
* Add SearchWidget for randomizing audio on seed gen.
* Remove comments on color picker entries in WidgetType.
* Put all search results in middle column for width management.
Change combobox alignment and label position in search results to unify them all to left and above for better organization.
Add "Search Results" text to header of results page for clarification.
* clang
* entrance shuffle: sign hints
* update entrance tracker with hint
* show sign hints when any entrances shuffled
* only hint when entrance shuffled
* avoid crash when loading rando file
* fix kf exit
* correct hint from sign outside kokiri forest
* 3 signs on DMT
* improve naming
On some distros format-security is turned on to detect possible issues
with non-string literals as format strings
Let's explicitly turn it on and fix the ImgUi text formatting to avoid
compile issues on those platforms
Signed-off-by: William Casarin <jb55@jb55.com>
* Separate HBA range
* Separate 4 rooftop regions
* Rest of rooftops
* Small cleanup
* Whoops
* Create `thieves_hideout.cpp` & move `gerudo_fortress.cpp`
* Ground and some inside
* More outside cleanup and more inside
* Kitchen
* Final tweaks
* Use `TH_` prefix for Thieves' Hideout locations
* Add clarifying images (+ `.xcf` source)
* Thieves' Hideout is overworld
* Fix `RC_GF_GS_TOP_FLOOR` & blue -> violet entrance
* Address review
* Update gerudo_fortress.cpp
* Address review
* Split "CarpenterRescue"
* Rename events
* Update logic.cpp
* Move from function to event
* Rename most of the regions
* Address review
* Add new conections
* update logic, get it working
* apply clang format
* undo clang format in logic files
* final reordering
* remove additions to .gitIgnore
* Fix some jump trick logic
* clean up ShufflePots
* fix submodules
* update for review and talk to jail and always gate PRs
* change thieves hideout to scene handling
* final fixes and update enum names and hint text
---------
Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>