Merged
Conversation
…s to InputOptions. Implement saving and loading of preset files.
Implement Apply. Implement Delete. Some json structure changes.
Pepe20129
approved these changes
Apr 29, 2025
Contributor
Pepe20129
left a comment
There was a problem hiding this comment.
Some small things but nothing blocking.
Restore auto-resizing to new preset popup. Remove errant BeginDisabled in randomizer (merge artifact?).
Setup loops for all other same-ish situations (applying presets, setting up columns, etc) based on blockInfo.
Lay the groundwork for said restoration.
Contributor
Author
|
Tracker size and position restoration completed. |
Add race lockout to new and apply buttons.
…e manually-set default states).
da07420 to
4835ff1
Compare
Contributor
Author
|
Alright, built-in presets now reside in soh.otr, and they can't be deleted (though I added an option for hiding built-ins in the manager section itself). Also re-enabled the satellite rando selector and hooked it up to the manager system. |
Swap randomizer satellite picker to use the manager presets, only displays presets with randomizer section included. Move built-in presets to the asset archive, and remove delete button on them. Remove PresetEntries.cpp.
4835ff1 to
7a5c86d
Compare
…n satellite selectors.
krazyjakee
pushed a commit
to krazyjakee/OOT
that referenced
this pull request
Sep 6, 2025
* Add presets sidebar, proof of concept row-based listing. * Complete and unify section check/x drawing. * Add error state to InputString, and corresponding members and builders to InputOptions. Implement saving and loading of preset files. * Implement `Config::SetBlock()`. Implement Apply. Implement Delete. Some json structure changes. * Apply `CVarClear()` calls in CVar-prefixed widget functions. * Comment out satellite preset pickers for now. * clang * Fix ButtonOptions initializer list. * I hate clang... * Loop new preset checkbox creation. Restore auto-resizing to new preset popup. Remove errant BeginDisabled in randomizer (merge artifact?). * Add BlockInfo struct to make array with all info for each block. Setup loops for all other same-ish situations (applying presets, setting up columns, etc) based on blockInfo. * Save tracker windows info for later restoration. Lay the groundwork for said restoration. * Complete tracker window restoration on preset application. * Fix RadioButtonsOptions builder parameter type. Add race lockout to new and apply buttons. * Revert application of CVarClear on UIWidgets widgets (need to preserve manually-set default states). * Remove enhancements satellite picker. Swap randomizer satellite picker to use the manager presets, only displays presets with randomizer section included. Move built-in presets to the asset archive, and remove delete button on them. Remove PresetEntries.cpp. * Fix locations and tricks tabs not updating live when applying preset with new system. * Apply RandoGenerating lockout to rando preset Apply button. * Fix new presets not being properly filtered in satellite selectors. * Fix currently selected presets getting deleted still being selected in satellite selectors. * Change BigPoeTargetCount in preset files to 1.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Custom presets! What more needs to be said?!
Alright, here's a general breakdown:
This removes the satellite preset selector in Enhancements and converts the one in Rando Seed Settings to the new system. Not sure yet if it will even be necessary to make new versions of those, but am awaiting feedback on whether it's greatly desired.
Also, a point of todo: need to figure out how to read, store, and restore tracker window info from imgui.ini.Reqiures Kenix3/libultraship#868Build Artifacts