* Remove 3drando setting descriptions
* Remove 3drando cosmetics
* Remove part of 3drando's menu
* Remove 3drando's music & sfx randomizers
* Remove 3drando's patch system
* Remove 3drando's citra logging
* Remove some of 3drando's custom messages
Some can't be removed (like the ganon la hint) as they are used
* Remove useless params in item_location.cpp
These types of SpoilerCollectionCheck just checked the rand inf corresponding to check and ignored the scene & flags params.
* Remove 3drando's unused check categories
* Remove some of 3drando's menu system
* Remove 3drando's preset system
* Remove some unused settings code
* Remove some unused settings
* Remove some unused ItemLocation params
* Remove SpoilerCollectionCheck::Fishing param
* Added Shield Aim Invert Y Axis Option
Adds an option in the menu that allows players to invert the shield aiming across the Y Axis. Defaults as checked to replicate original behavior.
* Shield Aiming Improvements
Added an option to invert X Axis Shield Aiming and corrected the default value for Y Axis Shield Aiming.
* Add toggle option for save states, off by default, with significant warning about what they actually do before enabling (double checkbox confirmation).
Add overlay text notification when attempting to use any of the state hotkeys if save states aren't enabled. Stays up for 6 seconds.
* Added coloration (yellow and orange) to the warning header.
* A little more clarification in the warning.
* Work on Voice rando
Todo: rename rest of entries and reorganize it into a new tab
* Finish going through voices for audio editor
Also make it, it's own tab. Added the option.
* Fixed adult link voices and recounted sound effects/voices
* Remove option
* Update soh/soh/Enhancements/audio/AudioCollection.h
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
* Remove commented out voices from sfx section
* fix spacing
---------
Co-authored-by: LuigiXHero <LuigiXHero@gmail.com>
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
* Initial attempt
* Fix rendering for most items
* Fixed icon sizes and reorganized icons
* Fix equipment, quest & upgrade icons
* Add colors to the song icons
* Remove box, clean up code & move seed hash icons to top
* Start with counters, fix copy & erase and show spoiler log hash icons
* Add icons for upgrades
* Draw icons for counters
* Initial counter work
* Fix counter digits positioning
* Prevent crashes when over 999 deaths (save editor)
* Add greg to tracker when in a rando save
* Fix color for counter digits using the wrong buffer
* Add double defense icon
* Addressed code review
* Remove unneeded checks against 0
* implement for install method packagers
* use std::filesystem::temp_directory_path
* absolutely impeccable
* include libultraship proof
* fix windows compilation
* rename "Installation" back to "Bundle"
---------
Co-authored-by: Alto1772 <56553686+Alto1772@users.noreply.github.com>
* fix rando gen crash when not enough remaining items to place
* fix rando gen crash due to missing granny shop hint
* add error sound if rando gen fails
* rewrite the logic to check for CRC32 at runtime
* fix include for windows
* fix pragmas
* more clang fixes
* MORE
* Please apple
* I hate this
* MAC AGAIN
* Clarify the ifdefs
* ARM64 fixes
* Reduce length of overflow prone item names
* Overhaul Trick Names and change Desert Waterfall to Valley waterfall
* Readd some old Trick names, Change Trick name table to a vector, improve french translations.
* Resolve#2682
* Add check for animation count to prevent continuing final saw textbox while putaway is happening.
* Added Fix toggle for it. Enabling Skip Text forces the behavior, regardless of previous selection for the Fix toggle itself (so it works if you have the Fix toggle enabled, or if you have Skip Text enabled).
* Clarified the comment in `z_en_toryo`.
* Change Granny's Shop collection type to RandomizerInf with proper scene and inf IDs so the tracker tracks it properly.
* Changed pendingSale code to be checked outside of decrementing if block.
* fix pal11 ganondorf falling platform offsets
* fix pal11 dins fire offsets
* add game region and platform methods
* fix pal11 file menu options
* move
* Add the flag and fix errors
* switch assert and skin matrix
* new LUS
* Use normal assert
* hopefully fix WiiU
Signed-off-by: Louis <louist103@pop-os.localdomain>
---------
Signed-off-by: Louis <louist103@pop-os.localdomain>
Co-authored-by: Louis <louist103@pop-os.localdomain>
Co-authored-by: Christopher Leggett <chris@leggett.dev>
* mirror fishing rod
* mirror ivan fairy controls
* add mirror dungeons only option
* mirror sold out GI texture
* update dungeons mirror mode for more options
* maybe don't include that
* Modified `SaveManager::AddSaveFunction` to return the section index assigned to the section name for ease of remembering it on the other end. Also added a clarifying comment.
* Modified SaveFunc to accept a boolean for whether the section is being saved individually or as part of a game save (fullSave == true means game save, so all sections registered for game save sync).
* Tweaks to extra modes menu
* Update soh/soh/config/ConfigUpdaters.cpp
Co-authored-by: Christopher Leggett <chris@leggett.dev>
---------
Co-authored-by: Christopher Leggett <chris@leggett.dev>
* hide menu bar from menu bar
* show `-` on switch/wii u
* actually show `-`
* actually put the thing in a place where it works
* spacers
* reorder and use `[-]` instead of `-`
---------
Co-authored-by: briaguya <briaguya@alice>
* linux local debug working
* built in extraction working on linux
* try a thing
* one more thing to try
* try using dir
* does this get the subdirectories?
* component before pattern
* loop i guess
* maybe component was the issue?
* zapd stuff i guess
* maybe this
* this feels promising
* g != q
* appimage is working, try fixing glfw issue on windows
* don't copy zapd.exe
* hopefully this gets the things we need in the assets dir
* is that where those went?
* try another thing
* another thing to try
* grasping at straws
* cmake makes no sense sometimes
* really just trying anything here now
* this is what i was expecting to work
* ls
* try doing it without the cmake again
* i think this might do the trick
* try with a slash
* one more thing to try
* pal_oot.txt
* maybe this makes things work on mac
---------
Co-authored-by: briaguya <briaguya@alice>
* Mirrored world PoC
* invert culling for health meter and A button action
* A few more fixes
* Fix for item equip animations
* Fix for pause triforce
* Mirror scenes with static backgrounds
* mirror minimap for mirror world
* mirror dungeon maps and icons on the pause menu
* mirror overworld map and icons on the pause menu
* mirror debug world movement
* mirror shops cursor and movement
* use flip flag
* Reverse crouch stab x axis for mirror mode
* use invert culling command and clean up culling logic
* Move mirror mode handler to mods and support random modes
* Small cvar tweaks
* mirror billboard score numbers and fix gyro horse mirrored inputs
---------
Co-authored-by: Adam Bird <archez39@me.com>
* WIP adding new config version.
* Implements a ConfigVersionUpdater
* Updates to account for new LUS-side changes.
* Change `ConfigVersionUpdater` to store `toVersion`
* fix typo
* only green the greg bridge not everything else
* another option
* do it the branch way
* tabs spaces blarg
* new dir
* use latest lus main
* latest lus main
---------
Co-authored-by: briaguya <briaguya@alice>
* use correct minimaps in randomizer
* fix minimap dungeon entrance placement
* rework topLeft0 check to be more readable
* who needs topLeft0 anyways
* move minimap hidden checks up higher
* numbers aren't magic
* chest style matches contents
renamed everything except the cvar itself at this point
(waiting for versioned configs for that)
* tracker as part of names
* finish the tracker rename
---------
Co-authored-by: briaguya <briaguya@alice>
* Initial PAL 1.1 support
* 1.1 Asset Fixes
* Fixed issue where N64 builds were being flagged as MQ
* Misc fixes
* Updated LUS submodule
* Fixed up logo strings
* Updated readme and linux/mac scripts with new hash
* reimplement stuff from 2879
* header include to fix build hopefully
* another header
* fix error
* remove header includes we don't have
* more error things
* a
* b
* c
* d
* e
* f
* g
* h
* use latest lus
---------
Co-authored-by: briaguya <briaguya@alice>
* Bump LUS
* Ship -> LUS namespace change
* z_scene_otr Ship -> LUS namespace
* Starting to get SoH to build with LUS imgui changes.
* start stuff
* gamecontroleditor build issues resolved maybe
* cosmetics editor and what not
* console
* actor viewer
* more stuff
* more stuff
* on to errors that make sense
* putting this down for a bit
* no idea what these errors mean now
* some kind of progress maybe
* latest lus main
* more
* back to linker errors and being lost
* Fixes command function signature.
* More fixes
* Even more fixes
* Bump LUS
* More Fixes.
* Fixes even more errors.
* lus bump
* input editor as var
* audio editor working
* it builds with this
* bump lus
* it opens
* bump lus to latest main again
* make sure to do all the command registering in debugconsole
* lus and what not
* switch type stuff plz
* undo
* do the thing that fixes the thing
* fix mac?
* correctly show/hide menubar on boot
* bump lus
* input blocking updates
* bump lus
* Bump LUS
* Press F1 to open enhancement menus moved to SoH
* lus and rendering backend stuff
* audio backend and lus
* Bump LUS
* Fixes WindowBackend dropdown
* Bump LUS
* misc -> utils and moves binarytools to utils.
* Window refactor
* bump lus
* make it work
* Fixes for moved files again
* Bump LUS
* Mercury -> Config
* Bump LUS
* Reacts to removed LUS hooks and bump LUS
* Remove Hook: GfxInit
* Removes debug audio_setgamevolume to 1
* use non-crashing branch of lus
* fix: make audio init work without hooks
* game icon stuff
* multifix bmp
* use input viewer class branch for now
* just "Ship" it's cleaner
* Bump LUS
* Removed ExitGame hook.
* Bump LUS
* Hook system removed from LUS.
* More LUS updates
* Changes to make window position saving.
* Bump LUS
* Bump LUS (for real)
* LUS resources now return a specialized pointer.
* Bump LUS
* Fixes issue in SetPathways::GetPointerSize
* Bump LUS to 1.0.0
* builds but crashes
* fix crash
* better macro names in debug console
* remove commeted out line
* remove redundant check tracker settings window logic
* remove commented out line
* move the *
* remove extra seqplayers enum def
* this sneaky little guy was hiding behind a wii u ifdef
* remove extra check tracker header
---------
Co-authored-by: Kenix <kenixwhisperwind@gmail.com>
Co-authored-by: briaguya <briaguya@alice>
* Trick and Glitch Rando UI implemented
* initial temp connection between ui and backend trick logic
Hacky way to connect the logic for testing. Ran into 1 crash but cannot reproduce
* UI overhaul to look more like AudioEditor tag section
* Mapped 3d tricks to enums and save cvar bug fixes
* Trick Logic Complete
Testing on whether the logic works as expected needs to be done
* Releasable trick version, tricks match text fixes also
* Remove 3D glitch logic location access
Easier to clean it up now than get confused
* Variable typo fix & initial trick enum reorganisation
* Removal of oot3d glitches
* bongo logic fix
* UI includes difficulty tags + cleanup and removal of glitched logic interface
* Bug fixes
* added enabled tricks to spoiler log
* comment clean up
* completed once over through logic
* merge fix
* update sohimgui to LUS
* Remove redundant 3d rando trick options
* Comment clean up
* Central GS Irons Logic Fix
* Farores wind central logic fix
---------
Co-authored-by: Christopher Leggett <chris@leggett.dev>
* First attempt at tracking hinted locations. Not looking promising for more than a hint tracker.
* Spoiler log now generates with human-readable hinted area, type, and item for gossip stone hints.
* Hints now only output location if their hint text specifically states the check. Any overworld or dungeon region hint no longer does.
* Expanded gossip stone hints to include item, hinted location and area, and `RandomizerGet` names. Currently only English names.
Part of this required changing `HintType` into a `typedef enum` instead of an `enum class` to allow usage in a .c filespace, and consolidating types from `randomizer_check_objects.h` to `randomizerTypes.h`.
* Beginning of alter rewards information.
* Step 2 of altar reward info.
* Altar reward info (location and area) now writes to and reads from the spoiler log. Added a few entries to `SpoilerfileAreaNameToEnum` to accommodate area name variants from region hint names.
* Streamlined altar data (only needed location name for `RandomizerCheck` translation. `RandomizerCheck` provides access to `RandomizerCheckArea` via `RandomizerCheckObject`).
Added Light Arrows, Greg, and Dampe's Hookshot hint locations to write and read of the spoiler.
* Fix attempts to lookup values in `hintTypeNames` as array, now uses map's `find()`.
* Ganon(dorf) cutscene skips
* Remove leftover code
* Load into chamber of sages
* Fix loading into chamber without fast file select
* Boss warps in chamber done
* Change warps back to chamber
* Initial proof of concept done
* ganon(dorf) cutscene skips
* Code cleanup & auto age equipment
* Gameplay stats timer + tweaks
* Scuffed timer
* Better timer
* remove arena props + fix arena exits
* Fix blue warps
* Attempt to fix build
* Fix build again
* And again..
* Try no. 9001
* Handle dying and saving
* Child link face fire medallion
* Fix build
* Fix warps after reset/death
* Disable doors and move player spawns in boss rooms
* Fix boss rush logo rendering
* Start of ingame options menu
* File Select cleanup
* Fix build
* Render char text PoC
* Move functions to be more generic
* Fix build
* Fix other builds
* Initial text scaling/kerning
* Special characters prep
* All special characters work now
* Attempt to fix build
* Fix build question mark
* Finish all kerning
* Start of ingame options menu with vertical scrolling
* Barebones functional options menu
* More options menu progress
* More visual elements for options menu
* Options menu visual changes, implement all options, tons of cleanup
* Cleanup and comments
* Shorter enums
* More options
* Change default heart count
* Finish French translations
* Implement timer in cosmetics editor
* Uncomment timer requirement
* Variable name change
* German translation & small UI tweaks
* Animated up/down arrows in options UI
* Better arrows in options UI
* Cleaner timer + make it usable for general gameplay
* More cleanup + ganon & ganondorf boss option
* Implement never heal option
* Slight up arrow in options UI tweak
* Add BGS option
* Reintroduce ganondorf cutscene skip
* Change encoding to UTF on bossrush.cpp
* Fix build hopefully
* Fixed static variables leading to options not properly resetting
* Fix BR completed timestamp
* Change timer to render on top of everything
* Offset final BR time by 0.1 second from boss timestamps
* Add missing check for boss rush
* Implement soh_assets.h
* Revert merge mistake
* Fix special characters with UTF-8
* Fix build
* here's the fix you can merge from your phone
* Fix quest select crash with oot.otr only
* Use OoT's kerning
* Fix HD textures on options menu
* Fix special character kerning
* "Heal every boss" fixes
* Seperate headers + bunny hood option
* Remove GetUnixTimestamp() externing
* Clean up extern "C"'s
* Address review comments
* Fix build question mark
* Remove accidental styling change
---------
Co-authored-by: briaguya <briaguya@alice>
* Add dynamic actor IDs
* Convert Ivan to use new actor system
* attempt to fix linux build
* attempt to fix linux build
* merge
* Cleanup
* Fix missing math functions on Windows.
* Removes a stubbed function to fix non-windows builds.
* Update soh/soh/ActorDB.cpp
Co-authored-by: Adam Bird <Archez@users.noreply.github.com>
---------
Co-authored-by: Christopher Leggett <chris@leggett.dev>
Co-authored-by: Adam Bird <Archez@users.noreply.github.com>
* Some reason not working
* Fixes and formatting
Moved the LACS Stones to be before the Medallions in all instances to line up with the Bridge requirements and because it just makes sense
* Removed unnecessary space
* Missed one
* Add Checkbox in Extra Modes
Spawn Code in mods.cpp
Category Change for Clear Room Exclusion
Kill Actor if Mode is Disabled
* Fix non door scene changes and adds a delay to avoid misfiring or not firing on quick room changes like falling to B1 in Tree and Lost Woods loading triggers.
* Requested Updates
* Add brightness control and on/off toggle for tunic LED colors.
* Removed toggle, mentioned brightness of 0% for turning off LEDs.
* Set up grabbing tunic color values from Cosmetics Editor for cosmetics sync.
* Why these stupid differences between Windows and Linux compilers?
* Fix Mac build errors? Also try to move the color fetching back into the switch statements to lessen potential computational load.
* Real fix?
* Move "Customize Game Controls" button under "Controller Configuration" button under Settings -> Controller. Renamed "Controller Configuration" to "Configure Controller" and "Customize Game Controls" to "Customize In-game Controls"
* Added LEDColor and LEDColorSource enums for code clarity.
Moved controller LED brightness to new LED Colors group in "Customize In-game Controls" menu.
Added combobox to choose between vanilla tunics, cosmetics tunics, health, and custom as color sources.
Added critical health override checkbox to allow display of red when health is low even when other sources are selected.
Port color pickers have not been implemented yet, default color is white.
* Moved LED control to OTRControllerCallback and wrapped it in a check to `CanSetLed()`.
* Move settings to Port 1 tab in Customize In-game Controls and limited application of colors in `OTRControllerCallback` to port 1.
* UI clarity updates.
* Removed unnecessary LED color enum.
Added custom color picker to port 1 color settings.
* Changed Critical Health Override default to true.
* Modified logic to not do color fetching and instead default to {0,0,0,0} when brightness is off.
* Fix bad cvar string for custom color.
* Cleaning up some post-merge artifacts.
* Update soh/soh/Enhancements/controls/GameControlEditor.h
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* Some name changes.
* idea for cleaning up controller callback stuff
* Rearranged color source checks to make sure criticalOverride is applied regardless of other settings.
---------
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Co-authored-by: briaguya <briaguya@alice>
Move the code to change those values based on the child trade slot item to the selecting mask loop to not be setting them every frame just because you're in the inventory.
* Adds const specifiers to some appropriate functions.
* Implements move semantics for ReplaceStringInMessage.
Should result in much fewer allocations when rendering custom messages during a Randomizer playthrough.
* Implements some more move semantics.
* First pass on improved Custom Messages API.
This should allow for fewer allocations during randomizer seed generation and runtime, plus a couple of other enhancements that utilize custom messages. It does this by taking advantage of move semantics to prevent extraneous allocations when string literals are passed in. It also takes advantage of OOP to hopefully end up with a cleaner API.
* Additional API/allocation related improvements.
* Removes an unnecessary destructor and constructor.
* Updates documentation
* Adds a bit more documentation.
* Fixes switch build problem and minor syntax error
* Renames slightly unclear operator parameter
* Replaces magic numbers with LANGUAGE_MAX
Implemented subsectional saving (handled in the section's save function, and passed to the save function by & pointer). Default of "all" passed in from SaveFile for game saves.
Implemented subsectional saving for sohStats and entrances/scenes discovered.
Fixed check for game save registry by putting the check against the registry in the "all" section save code.
Fixed loading and saving of blank sceneTimestamps due to default construction of data structures during JSON loading making all "empty" entries have scene and room of 0.
Moved SoH stats initialization to `gameplaystats.cpp` via `SaveManager::AddInitFunction`.
