* Changed OnReceiveItem hook to pass GetItemEntry, which required the following changes:
Reworked the references to it in `z_parameter` to call a single function with the item return and hook call in it for ease of editing.
Modified the pendingSale functionality to set and pass a modIndex value as well, as mod items (like randomizer) in shops still use the vanilla sale path.
* Missed some files for the pendingSale changes.
Also added Randomizer_Item_Give to the OnReceiveItem system.
* Ice traps now trigger OnReceiveItem.
* All ice traps truly do work now.
As a side effect, item autosave doesn't work for shop/scrub/merchant transactions, requires new OnSaleEnded hook that can also call the autosave.
* Removed unnecessary calls to ItemTable_RetrieveEntry where GetItemEntry properties were being used to call it. General code cleanup.
* Added OnSaleEnd hook for when rupees are finished deducting after a sale.
Migrated AutoSave to its own function, registered AutoSave function to OnReceiveItem and OnSaleEnd hooks to help with autsaving after buying items.
Some futureproofing for AutoSave function with parameters for skipping autosave, for when transition end is migrated to AutoSave function (whether through direct call or through a hook).
* Renamed hook paramaters, and registered hook function parameters, to a more descriptive alternative.
* Missed a couple, fixed a typo.
* One more missed paramater name refactor.
Refactored all references to OnReceiveItem to OnItemReceive to mirror upcoming full hook refactor for name ordering conventions.
Up-to-date with develop.
* save build version to savefile
* adjust rando hash icons to use fade in/out
* add dialog message support on the file select screen and display rando version warning
* remove duplicated message functions and use stubbed play state instead for rando warning
* add major/minor/patch version saving to file and compare against
* use strncpy and memset for build version
* don't show rando warning one copy/erase screens
* review feedback
* Add german and french translations for rando warning
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
---------
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
* Restored vanilla pause buffering and input behavior broken by 'easy frame advance' cheat
Currently, holding A and repeatedly pausing and unpausing will cause that A input to be repeated, resulting in Link rolling without additional A inputs. Similarly, holding Z and unpausing in front of a candidate actor will cause Link to switch Z-targeting to that actor.
As a side effect, this also does not allow inputs to be buffered before the Subscreen has finished its closing animation, which is how vanilla also works. This is slightly unfortunate because the "freeze" before the game resumes is considerably shorter in Shipwright, but it'd be better to implement a fake delay there if we want to make it more forgiving.
* Fixed writing past end of the buffer when loading personal item tracker notes longer than 8 characters
* Revert "Fixed writing past end of the buffer when loading personal item tracker notes longer than 8 characters"
This reverts commit 721c18d488.
* ss2
* Remove Comments and Rupees when dead.
* Rupees removal for real
* Updated Inline formatting as well as changed Mode Idenitifier from Super Sonic to Rupee Dash.
* Add OnPlayerUpdate hook
* Move rupee dash to hooks
* Update comment for DashInterval
* ss2
* Remove Comments and Rupees when dead.
* Rupees removal for real
* Updated Inline formatting as well as changed Mode Idenitifier from Super Sonic to Rupee Dash.
* Add OnPlayerUpdate hook
* Move rupee dash to hooks
* Update comment for DashInterval
* Update Health to not crash on less than 16 units.
* lus
* fix build, use `Health_ChangeBy`
---------
Co-authored-by: Caladius <Caladius@users.noreply.github.com>
Co-authored-by: David Chavez <david@dcvz.io>
* add loadgame/exitgame GI hooks
* implement loadgame/exitgame hooks in game code
* move entrance tracker data lifecycle to hooks
* update cosmetic editor to update onloadgame hook
* Restore greg stuff
* Cleanup
* Actually check for Greg when creating Greg hint
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* whoops
* Update soh/soh/Enhancements/randomizer/3drando/hints.cpp
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* fix greg hint crash, clean up hint generation (clear out hints when setting is off)
* update vanillafill too
* fix text id, parse json, expand array to fit hint
* actually parse/use greg hint RSK
* specify "after buying a key" in hover text hint
---------
Co-authored-by: David Chavez <david@dcvz.io>
Co-authored-by: Ralphie Morell <stratomaster64@gmail.com>
* make greg bridge more greg
* use green rupee color from cosmetics editor
* use hooks to not patch/unpatch every frame
* use gi hook
---------
Co-authored-by: briaguya <briaguya@alice>
* Adds price range select box for shopsanity when shopsanity is 1 or more items.
Default option is the original functionality, now under "Random" select option.
Other options include Affordable, which makes each item 10 rupees, and one option for each level of wallet available with shopsanity, where each wallet's max capacity is the upper limit on the price randomization. These still go in 5 rupee increments, like Random.
Also keeps track of and saves/loads settings appropriately on game start.
* Changed "Random" default shopsanity price selection to "Balanced" to be more properly descriptive.
Refactored GetRandomShopPrice to try to keep Balanced as the default, with a sane fallback price of 150 should the weighted randomizer somehow fail.
* Missed one change from Random to Balanced.
* Changed wallet range to minimum of 5, and removed the multiple of 5 requirement (full rando within range).
* Modified the system to add a checkbox for affordability which then adds a price cap that is just above the max value of the previous wallet tier. Effectively this keeps the wallet lock in place, but prevents anything from getting more expensive than 5 past the previous tier.
* Fixed hover help text and tooltip formatting.
* Changed wallet ranges to generate multiples of 5. May need weighted generation after playtesting.
* update writealllocations to always write trickname and start seeing where things break
* handle simple vs complex items
* always grab a trick name
---------
Co-authored-by: briaguya <briaguya@alice>
* Hide return transitions for dungeon, grotto and interior entrances when "Decouple entrances" is off.
* "Highlight last entrance" now highlights the override reverseIndex entry in the list if "Decouple entrances" is off, to correspond with not displaying return directions for the same setting (without this, nothing gets highlighted with the return transitions hidden with "Decouple entrances" off).
* Removed unnecessary printf
* Moved redundancy check to filtering loop instead of display loop.
Introduced setting to optionally force showing redundant entrances when decoupled is off.
Formatting changes suggested by Archez.
* Changed "show redundant" to "hide reverse" where applicable, and change
Added option disabling based on Decouple Entrances.
* Finished descriptive comment.
* Moved "Hide reverse" to left column of tracker settings.
Changed to PaddedEnhancementCheckbox, changed checkbox padding accordingly, and set default to true.
* Restore tooltip to Hide Reverse option, fix default value.
Co-authored-by: Adam Bird <Archez@users.noreply.github.com>
* Restored padding underneath last option in entrance tracker List Items section.
---------
Co-authored-by: Adam Bird <Archez@users.noreply.github.com>
* Rename "SFX Editor" to "Audio Editor"
* Move some functionality out into a new class `AudioCollection`
* Add a tab to exclude sfx/sequences from shuffle pool
---------
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: briaguya <briaguya>
Co-authored-by: David Chavez <david@dcvz.io>
* Update z_camera.c
* Update GameControlEditor.cpp
* Update GameControlEditor.cpp
* Update GameControlEditor.cpp
Adding Sliders for first person X and Y axis
* Update z_player.c
Modified variables to allowed separate sensitivity settings for x and y axis
* Update z_camera.c
* Revert "Update z_camera.c"
* Update GameMenuBar.cpp
Added tickbox for NoFPChus
* Update z_player.c
Added check for Disable First Person Bomchus enhancement
* Update z_player.c
Removed comment as statement is clear on its own
* Update GameMenuBar.cpp
* Allows strings to be used for rando seed hashes;
updated conversion method from `stoi` to `stoul`
* apply suggestions
* Allow spaces + autoselect on input field focus
* Added new text filter; applied suggestions
* leaving 3d rando logic alone
* Apply more suggestions
* Revert buffer size to 1024
* Projectile ammo matches ItemAction instead of age
extracted logic from months-old PR
* Added cvar under "Enhancements -> Gameplay -> Items" for bow/slingshot ammo
* Update GameMenuBar.cpp
* fix entrance init and entrance tracker not working properly when no spoiler log is loaded
* fix rando adult trade spoilable items reverting when no spoiler log loaded
* fix market night escape to work with entrance rando; adjust HF bridge spawn to not have link fall in water at night
* use scene enums for ER logic instead of magic nums
* fix sun song loading are with wrong link position with grotto shuffle on
* Update soh/soh/Enhancements/randomizer/randomizer_entrance.c
* TWEAK: Controller Navigation rename + tooltip
* TWEAK: add back FW
* TWEAK: Button size + name
* TWEAK: Tooltip and text position
* TWEAK: added a PaddedSeparator
* TWEAK: Removed the padding from aMannus Request
* Moves SoH mixer to SoH from LUS.
* Debug camera now works in SoH, but mempak saving does not (yet).
* Debug camera is now enabled/disabled based on the gDebugEnabled cvar.
* Updates OTRGlobals comments
* Updates OTRGlobals comments
* Increases the actual block pushing speed.
Previously this enhancement only decreased the delay between pushes in any noticeable way because the top speed of the blocks was clamped. The enhancement now increases the top speed of the blocks according to the slider's value.
* Applies previous changes to milk crates.
* Applies same fix to fire temple stone blocks
(I believe these are the ones with the faces on them)
* Applies fixes to Poe painting blocks (forest temple)
* Begin GameInteractor
* Basic skeleton of PoC
* WIP
* First 2 CC effects transitioned to GameInteractor
* Prepare GameInteractor classes for CrowdControl
* More effects & replace chaosEffects with GameInteractor
* CC connection fixes & all CC effects (enemy spawns still borked)
* First couple of build error fixes
* Fix build
* Proper enemy spawning
* Clean up old CC code
* Extract link size/invisibility into GameInteractor
* Small fix/cleanup
* Suggestions for PR
* Address PR comment
* Addressed more comments & small adjustments
* Fix crash when spawning enemies
* Remove Remove()
* Move checks into Apply() and move CC and some console commands to it
* Use inheritance to abstract check on application
* Rename prefix Actions with RawAction
* Make Remove return a Result
* Fix issue with compilation
* debugconsole -> GameInteractionEffects progress
* Add State in GI
* Unify some Effects
* Port more debug console items
* Remove state modifyiers from raw actions
* Port over last raw action / state in console
* Adjust some types
* Consolidate link size modifier effect
* Adjust more types
* Define category strings in CC
* Clean up remaining non defined strings
* Fix bug in timed effects
* Rename old pack
* CC fixes
* Translate GI enum function
* Console cleanup/fixes/consistency
Co-authored-by: David Chavez <david@dcvz.io>
* fix: add missing comma to fix oob
* bring back some old rupee names, remove some that don't render properly
Co-authored-by: briaguya <briaguya@alice>
* Add enhancement for dog following you everywhere
* Persist dogParams to save file
* Make doggo float in water
* Wrap change in cvar condition and update cvar usage
* Finish translations for Map Select
* First Pass
* TWEAK: Add back Japanese as default to conserve vanilla
* TWEAK: replace some array with structs + some translations
* TWEAK: loading messages [TODO: proper translations]
* TWEAK: forgot to push z64.h for loading messages + translated scene type
* TWEAK: spacing
* TWEAK: comment
* TWEAK: Small german OPT position
* TWEAK: german typo
* TWEAK: translation to cutsceneLabels
* TWEAK: Nabooru's name + Lairs
* TWEAK: Updated Cvar to new way to call them
* ADD: German
* Debug localization
* TWEAK: Age
They are noted as a flag thingy and not a literal age
* Tweak: Frogot the Great Fairy
* TWEAK: adressed comment
Co-authored-by: Amaro Martínez <xoas@airmail.cc>
* audio & rendering backend option greyed out if theres only one
* add audio fallback code
* InitializeAudioPlayer/WindowManager add param
* string -> string_view
* Revert "audio & rendering backend option greyed out if theres only one"
This reverts commit e94a7fff50.
* revert lus changes
* moved fallback function to LUS
* use audioplayerbridge
* full health spawn
Co-authored-by: MoriyaFaith <46070717+MoriyaFaith@users.noreply.github.com>
* add enahancement to gamemenubar, update to use new cvar method names, simplify save loading logic so loading a save with less than 3 hearts spawns with full hearts with enhancement enabled instead of spawing with 3
* formatting
Co-authored-by: MoriyaFaith <46070717+MoriyaFaith@users.noreply.github.com>
when pulling in documentation i missed a couple returns
this was causing mido to never stop blocking the path to the deku tree
after searchign the codebase, i found two instances of this mistake
this pr fixes them
Co-authored-by: briaguya <briaguya@alice>
* New function: overlay text duration in seconds.
`Overlay_DisplayText` took a float as an argument, with no clear indication of what that float represented. That float also evaluates to different durations given different frame rates. However, since we know what the frame rate should be at any given time (since it's stored in a CVar) we can calculate what this duration should be based on the number of seconds we want the overlay to be displayed. That's what `Overlay_DisplayText_Seconds` does.
* Adds Slider for Overlay Sequence Name Durations
* sync 3ds upstream logic changes for boss rooms
* add boss shuffle settings and handling to 3ds code
* add boss shuffle handling to game code
* repair authentically bugged entrances for boss shuffle
* add boss entrances to the entrance tracker
* unset hint area for boss rooms to fix altar hint
* update boss reward hints to not mention dungeons
* one more boss heart container hint fix
* reorder entrance rando funcs
* support closed forest with boss shuffle and simple boss room entrance pairs in shuffle table
* fix death warp in boss rooms without saving; fix KD boss room in tracker
* remove boss shuffle check from dungeon open checks and some cleanups
* add boss shuffle to preset clear
* remove dungeon entry exit connection from boss rooms
* another no hint fix for boss shuffle
* undo change for exact location hints
* clarify comments
* Added too much
* Added 3d settings and brought over to soh
* fixed conditionals for replacing LA hint
* whoops
* Finshed making settings consistent; minor text edit
* fix leftovers from adding warp hints
* more fixes from merge
* fix skull hint messages
* Added fire temple goron junk hints; menu stuff
* Address feedback
* Added optional scrub text
* whoops
* Add hint cvars to clear preset func
* whoops again
* whoops the third
* ADD: French Pass
* FIXED: Dampe + Skull Reward
* TWEAK: German skulltula hint
* TWEAK: French oopsie
* Address feedback
* whoops
* remove "staticness" from altar/ganon text funcs
* ADD: German
* actually add warp song hints to things;
always generate ganon hint and let OTRGlobals handle showing it
* Fix CVar Getters
* whoops
* for real this time
* Actually implemented scrub text in 3d rando
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
* Adds option to add higher pitches to silver rupee jingle.
Some rooms in Master Quest had 10 silver rupees, but the game was programmed to only play the jingle 5 times and then just went silent for the rest. This option adds 5 more transposition values to the array, and an option to play them (so that authentic behavior is preserved by default).
* Adds the new option to Vanilla Plus preset and up
Also adds it to the list to be reset back to 0 when applying the default preset.
* Changes display name of checkbox.
* Change CVar_GetS32 to CVarGetInteger
* Adds option for showing sequence names on the overlay
Allows sequences to appear on the overlay in the bottom right corner for a few seconds whenever a new one is loaded into the primary sequence player. This means it does not apply to fanfares or enemy bgm. Fanfares I chose not to display because it would cause a lot of text to display back to back in some areas, and enemy bgm would have some technical challenges with this due to the way it loads. Mainly because the Lost Woods music would load in Goron City the same way (as well as the opposite).
* Fixes crash when a sequence without a name is attempted to be displayed.
* Removes accidentally committed CMakeSettings.json
* Updates CVar_GetS32 to CVarGetInteger
* Adds lock/unlock all buttons to Cosmetics Editor.
Adds Lock All and Unlock All, which locks all visible cosmetics options (i.e. does not lock the advanced options if Advanced isn't checked, just like the existing randomize all buttons), and a Lock All Advanced and Unlock All Advanced button that is only visible while the Advanced Options are enabled.
* Updates latest develop and CVar API Changes.
* Revert "Fix Ganondorf boss battle ending (MQ only) (#2072)"
This reverts commit 52b896271c.
* yolo this should work
* finish comment
* see if this doesn't lag switches!
* formatting
* formatting
Co-authored-by: briaguya <briaguya@alice>
* Fixes randomization of individual sound effects.
* Re-adds the mistakenly removed const specifier.
* Implements new randomization syntax that actually fixes the crash.
* Increases default width of sfx editor menu.
The default width was cutting off a lot of the text in the dropdowns due to the added Randomize button.
* TWEAK: Some Rando Text
French and German tweaks (German made by Timmy_GamerNepgear on Discord)
Tweak: water control level style to fits Navi's style textboxes
* TWEAK: %c instead of %w
* Fixes receiving the wrong item when picking up ammo drops near a chest.
Still shows the wrong model above links head but does give the right
item and shows the right text.
* Fixes get item model during first time pickup anim near chest.
* Revert json key changes in save v1 and v2
* Introduce save v3
* Add workaround for breaking save compatibility in 5.1.0
* Handle scarecrow long song a bit differently since the array is never empty
* fix: set color picker alpha on reset
Fixes a bug where the colour picker enhancement widget without alpha uses a garbage value for alpha on reset
Co-authored-by: sonoftunk <sonoftunk@gmail.com>
* formatting
Co-authored-by: sonoftunk <sonoftunk@gmail.com>
Co-authored-by: briaguya <briaguya@alice>
* Initial camera distance slider
* works with freecam
* improving the settings configurability, adding distance slider and transition speed for the free camera
adding seperate sensitivity and invert settings for aiming/first person camera
* spelling
* tooltip msg on camera invvert
* typos
* removing the original free camera checkbox in experimental menu
* adding name change to new presets file
Co-authored-by: RaelCappra <rael.cappra@gmail.com>
* added fix option to fix camera swing; Fixes camera getting stuck on collision when standing still, also fixes slight shift back in camera when stop moving
* add option to fix hang off ledge swing rate; Fixes camera swing rate when player falls of a ledge and camera swings around
* adding camera fixes to preset list
* Removes problematic sequences from the list.
These sequences were part of the ending and credits and thus didn't loop correctly.
* Readds problematic sequences as `SEQ_NOSHUFFLE`
* add lake hylia water control system
* fix actor spawn params
* remove non-working switch details
* adjust french translation
* fix object spawn
* use flag funcs
* use renamed eventchk flag for raise lh water
* Initial Auto-Location Tracking
* Updates styling for checked items in Check Tracker
* Fixes crashing issues with Check Tracker rendering
* Auto scroll Check Tracker windows to current area
* Checks Tracker only shows checked locations once in game
* Fixes issue where Check Tracker would auto-scroll to wrong location when entering a grotto
* Fixes gerudo fortress checks showing in tracker when settings have them removed
* InfTable Check Location Fixes: Lost Dog Richard, Rolling Gorons, HBA 1000, Thawed Zora
* Fixes most Event Chk Inf Checks on Check Tracker, and Frogs
* Check Tracker - Song from Malon now works
* Check Tracker
- Fixes Claim Check check not tracking
- Fixes spoiler for Claim Check check when getting Biggoron's Sword
- Fixes LACS being spoiled and not tracking
* Check Tracker - Fixes#2 for Skull Mask and Mask of Truth checks
* Check Tracker
- Adds support for merchants
- Fixes#7 for Bomchu Salesman
- Fixes#12 for Medigoron
* Check Tracker - Fixes#8 for Song from Saria
* Check Tracker - Fixes#9 for Adult Shooting Gallery
* Check Tracker - Fixes#10 for Composer Grave
* Check Tracker - Fixes#14 for Song from Ocarina of Time
* Check Tracker - Fixes#16 for Shooting the Sun
* Check Tracker - Fixes#19 for Darunia's Joy
* Save Editor - Adds missing label for Treasure Chest Game
* Check Tracker - Fixes Great Faries checks
* Check Tracker - Fixes Sheik at Temple
* Check Tracker - Fixes Great Fairy auto-scroll to wrong location
* Check Tracker - Updates blue warp checks
- Fixes Bongo Bongo and Twinrova checks
* Check Tracker - Fixes Dampe's Gravedigging Tour
* Check Tracker - Fixes Prescription to King Zora
* Check Tracker - Fixes Bazaar showing under wrong area on tracker between adult/child
* Check Tracker - Fixes scroll for Hyrule Market and Bazaar
* Check Tracker - Fixes giving Adult Trade Items shown on tracker: Broken Sword, Saw, Cojiro, Eyeball Froge, and Eyedrops
* Cleans up item_location
* Check Tracker - Item List
- Fixes item list not updating when changing seeds/options
- Separates item exclusion list from item check list
- Clean up comments
* Check Tracker - Adds Skip functionality to buttons
* Check Tracker - Refactors adult trade items to RandomizerInf
* Check Tracker - Fixes an issue where any time an item is removed the tracker would cause an application crash
* Check Tracker - Item names are now dependent on file language
* Check Tracker - Fixes Gerudo Card check not showing in Fast setting
* Reorders headers to (hopefully) avoid CI build conflicts on linux/consoles
* Explicitly defines vector header in randomizer.h to fix compile errors
* Complete Refactor of Check Tracker ImGui
* Adds missing check tracker files to CMakeLists
* Reverts the Item_location whitespace cleanup from ad10807c
* Check Tracker - Loading Fixes
- Fixes a bug where loading a save file a second time would add all the checks again
- Fixes a bug where the check tracker would not render at all until in a save file
* Check Tracker - Fixes a bug where checks would sometimes fail to load
* Check Tracker - Fixes duplicated checks when using Only on Pause or Only on Combo
* Check Tracker - Works around issue where single characters don't show in EnhancementCombobox, and fixes a label for combo buttons held option
* Check Tracker - Applies all Check Tracker changes to Item Location
* Check Tracker - Updated Check List
- Adds Link's pocket, either in KF or HM depending on starting age
- Supports Scrubs and Merchants
- Uses enums instead of magic numbers
- Updates DC Scrub Short Names for MQ
* Check Tracker - Adds a performance mode option
* Check Tracker - List Fixes (requires new rando generation)
- Fixes Frogs Rupees always visible
- Fixes Kokiri Sword Chest not showing
- Fixes Weird Egg not showing
* Check Tracker - MQ List basic support
* Check Tracker - MQ/Vanilla anti-spoilers
* Check Tracker - Collecting a compass now spoils the area
* Check Tracker - Basic Vanilla Support and fixes
- Vanilla items show in check tracker, even if many won't auto check
- Fixes an issue with Gerudo Fortress Keys
- Refactors IsVisibleInCheckTracker to randomizer_check_tracjer
* Check Tracker - Fixes merge conflict from 08a487f35e
* Check Tracker - Fixes tracker loading as Floating when default value is set to Windowed
* Randomizer Location Exclusion List
- Adds Scrubs, Merchants, Shops. Adult Trade items, MQ Dungeons, and Bean Salesman
- Fixes Kokiri Sword Chest, Weird Egg, and Frog Song Rupees from misbehaving
- Updates Gerudo Fortress logic to be dependent on Open/Fast/Normal Fortress
- Removes Invalid Check
- Adds RO Enum for MQ settings
- Updates magic values to RO enum
* Location Exclusion List - Scrubs that are always randomized now always show on the list
* For now, removes some extra code only needed for a Check Tracker.
* Randomizer Location Exclusion List - Fixes Eyeball Frog from showing up when Adult Trade Items was off
* Location Tracker - Updates Eyedrops to use RandomizerInf instead of Chest
* Check Tracker - Fixes a bug where Link's Pocket item wasn't acting as checked for area item count
* Check Tracker - Fixes a bug where Locations would incorrectly say Vanilla due to the first check in the area being a non-MQ check
* Check Tracker - Fixes a crash when Check Tracker is docked but not visible
* Check Tracker - Fixes areas being spoiled when loading different save files
* Check Tracker - Only reset variables if they are initialized
* Check Tracker - Cleans up old comments, unused variables, methods, and macros, adds language TODOs,
* Check Tracker - Readds rainbow UI elements after Cosmetics Editor refactor
* Check Tracker - Removal of flag lookup that was refactored, no longer needed header, and some trivial whitespace fixes.
* Check Tracker - Refactors Index to Bitmask code to a macro
* Check Tracker - Changes ordering from alphabetical to RandomizerCheck ordering
* Check Tracker - Wraps everything in a namespace to avoid global variable usage
* Check Tracker - Explicitly defines for-loop scope
* Check Tracker - refactors dungeon lookup from static array to function
* Fixes a bug when using EnhancementColor with alpha
* Check Tracker - Refactors all colour to use direct conversions
* Check Tracker - refactors settings loading and check visibility for readability
* Check Tracker - Fixes a bug where the wrong label showed on the Check Tracker BG Color
* UIWidgets - Adds Alpha bar to EnhancementColor when using alpha parameter
* Randomizer Location Exclusion List
- Adds Scrubs, Merchants, Shops. Adult Trade items, MQ Dungeons, and Bean Salesman
- Fixes Kokiri Sword Chest, Weird Egg, and Frog Song Rupees from misbehaving
- Updates Gerudo Fortress logic to be dependent on Open/Fast/Normal Fortress
- Removes Invalid Check
- Adds RO Enum for MQ settings
- Updates magic values to RO enum
* Location Exclusion List - Scrubs that are always randomized now always show on the list
* For now, removes some extra code only needed for a Check Tracker.
* Randomizer Location Exclusion List - Fixes Eyeball Frog from showing up when Adult Trade Items was off
* Apply suggestions from code review
Location Exclusion List - Applies suggested dungeon item defaults
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* Cosmetic Editor v3
* Workaround for cvar_clear not working correctly
* Nest RGBA values under Value key
* Implement arrow cosmetics
* Implement keese cosmetics
* Tweaks to life meter
* Implement file choose color
* Remove old title fire colors
* A few more silly things
* Fix from upstream pulls
* Fix hilts and sword during ganon cutscene
* Add slingshot
* Add metal trap and red ice
* Add iron knuckles cosmetics
* Add navi cosmetics
* Attempt to fix linux error
* adjust some comments and alignment
* Implement trails cosmetics
* Implement charged sword spins
* Comment out options that haven't been implemented
* Fix exploded rupee color in shooting gallery
* Add two silly options
* Add comments and minor changes from feedback
* Adjust comment about boomerang gem
* Gracefully handle chest textures missing
* Allows OTRExporter to parse pairs of .seq and .meta files
* Gets added sequences available to SfxEditor and playing in game.
* Some cleanup of the names appearing in the SfxEditor.
* Moves sequence swap lower in the audio command stack.
* Increases temp cache memory available on title/file-select screen.
Certain sequences wouldn't play on the file select and title screen
because they were too large to be cached.
* Introduces workaround for 255 sequence limit.
* Bug fixes and cleanup.
* Fixes bug where fanfares would sometimes disable the sequence player.
* Fixes bug causing certain areas to discard caches when loading enemy music.
* Fixes potential config-related crash by replacing invalid characters.
* Allows custom bgm to play in all BGM categories.
* Properly randomizes the custom tracks.
* Moves custom sequences to a patch OTR.
* If custom music was not loaded, fall back to default values.
* Prevents OOB crash on Synthwave array and adds octave drop feature.
Added octave drop to experimental features, which drops the octave of
a note that is too high for the audio engine to actually play. Without
this, some custom sequences have notes which cap at a specific value
and sound terrible. At least with this they will still harmonize with
the other notes. Experimental tab added to the SfxEditor to house
the checkbox for the octave drop feature.
* Adds more pool memory for a few tracks that couldn't fit.
* Some cleanup on the generated music archive process.
* Fixes missed memory boost from earlier.
* Adds ability to remove enemy proximity music.
* Applies correct cache policy to fanfares to prevent unloading sequences.
* Removes case-sensitiveness of the sequence type.
* Fixes not reverting to sequence after miniboss.
* Fixes transition to/from miniboss (again) and ocarina bug.
To be clear, fixes the more rampant portable ocarina bug present in my earlier builds, not the authentic one.
* Finally properly fixes transitions between sequences
For miniboss fights and SfxEditor previews.
* Removes unneeded boolean expression.
* Adds randomize button to individual SFX Editor entries.
* Fixes lost woods music overwriting goron city music.
* Plays swapped Hyrule Field music when transitioning to daytime.
* Fixes swapping Gerudo Valley music when transitioning from daytime.
* Updates custom sequence OTRPath to match SequenceOTRizer.
* Reverts changes to OTRExporter in favor of external tool
* Fixes formatting issues.
* Attempts to fix formatting issue in git diff.
* Should actually fix formatting issues.
* Should fix mac/linux exclusive build error.
* Fixes segfault on macos.
* sort custom seqs
* Fixes audioseq crash when under 255 seqs
* Removes magic numbers.
* Removes commented out code.
* fixes formatting in SfxEditor.h
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* Cleans up the one hardcoded QueueSeqCmd call.
* Fixes unneeded erroneous memory boost applied earlier.
* Applies additional formatting/cleanliness suggestions from review
* Fixes small logic bug
Co-authored-by: RaelCappra <rael.cappra@gmail.com>
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
This was causing an issue where hints were not being properly parsed,
because ParseHintLocationsFile was erroring out when trying to read
from a part of the json that didn't exist. Since that method is using
pokemon exception handling, it was failing silently.
This just makes it so the key in the spoiler log matches the key we're trying
to read (and brings it in line with the rest of the warp text names)
Co-authored-by: briaguya <briaguya>
* initial pass for entrance tracker
* add search meta tags to entrance tracker data; clear entrance tracker on title screen
* rename to use playstate/play
* fix lus imports
* move discovered entrance info to SohStats struct
* Add scene info and highlighting to entrance tracker
* hide undiscovered text when searching
* add comments for entrance tracker
* fix merge conflict error
* account for zora river -> hyrule field water entrance in tracker
* fix assignement error
* remove unneeded defaults from debug file init
* adjust entrance tracker settings and add more search tags
* convert magic numbers to defines; add more comments to entrance tracker; clarify variable names
* add reverse index to entrance tracker data to compare with instead of using strings
* rename variables
* ADD: Rando German Custom Messages
Thanks to Timmy_GamerNepgear on Discord for the translation, I basically just formatted the text
* TWEAK: Forgot a small breakline
* use trial enum instead of magic numbers
* simplify trial count/random trial logic
* set default to set number
Co-authored-by: briaguya <briaguya@alice>
* First round of upstream updates and commenting patternss
* Renames from z64player
* Renames from z64save
* Undo changes to legacy save struct
* Add missing reference from entrance rando
* Fixes from stat tracker
* More tweaks
* fix int sliders to fill the window like float sliders
* add a spacer to make it consistent with float slider
* add a spacer to make it consistent with float slider
* adding pop width further constancy with float slider
* First test of gathering some gameplay stats
* timer changes and other stuff
* Move code to new files + rename
* Name change - gamePlayStats
* Finish rename, remove n64ddFlag checks
* Improve item get times
* Better time tracking, more stats,
* Put button under Enhancements
* Fix merge conflict
* Add pauseCount, fix bug with rando items
* Adjust inits/declarations
* step counter
* Name change: "itemGetTime" to "timestamp"
* Tidying + CI test
* Set up array for stat counts
* Macro
#define GAMEPLAYSTAT_TOTAL_TIME (gSaveContext.gameplayStats.playTimer / 2 + gSaveContext.gameplayStats.pauseTimer / 3)
* Add boss defeat timestamps
* Add sword swings, pots broken, bushes cut
* fix int type
* Add counts for enemies defeated
Broken down by enemy, with a total
* Add ammo used
* Hide breakdowns until count > 0
* Forgot Big Octo
* Count chests opened
* Update after LUS submodule
* Enemy count spacing
* Comments
* Count 3 mini Floormasters as 1 Floormaster
+ some cleanup
* Comments
* Colour coding for timestamps on quest items
i.e. medallions/stones/songs
* Move stat into the sohStats struct
+ rearrange the counts enum for easier addition of future counts
* Some documentation + count button presses
* Stop counting button presses when Ganon defeated
* Couple bugfixes
Add count for Gerudo Thief, fix step counter counting in some situations where it shouldn't
* Fix comment
* added rando option enum; added options to load from spoiler file
* whoops
* Moved to `randomizerTypes` header; fixed ammo drop enum
* Actually populated options with new enums
* Added add'l enums for ganon boss key
* Added difficulty settings menu for shooting gallery
* Reverted linux assert fix for PR
* Added difficulty option to not randomize rupee order as adult
* Changed checkbox wording due to text overflow
* Reverted incorrect change from merge
* Update soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
* Added Checkbox to turn on and off all customizations in shooting gallery behavior
* Added disable-switch for sliders, shooting gallery difficulty options are now disabled when customize behavior is turned off instead of hidden
Co-authored-by: Ralphie Morell <rafael.morell@techfield.us>
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
* Added button to switch age
* Added logic to switch link's age
Reloads link from last entrance he went through once his age is switched.
* Link now respawns where he last was
* Update game.c
* move setting to GameMenuBar.cpp, fix build issues
Co-authored-by: Jake Edvenson <77412657+JakeEdvenson@users.noreply.github.com>
Co-authored-by: briaguya <briaguya@alice>
The implicit declaration was causing issues on Linux when building in release mode. The call was getting optimized out which was preventing the "equip now?" message box from functioning as intended. Adding the `Message_ShouldAdvanceSilent` declaration to `functions.h`resolves the issue.
* First pass on SFX Editor
* Fix crash at night in Colossus (and probably other undocumented issues)
The SFX editor was swapping out the bytes corresponding to the sequence
to be played regardless of the audio command being issued. This fix
ensures the swap will only happen on commands which actually treat those
bytes as a sequence identifier.
* enabling a few more songs/fanfares
* Removing a few broken bgms, fixing the preview button returning to the wrong bgm
* Fixes restoration from miniboss music to previous one
* add timed minigame into the sounds pool
* A few small tweaks
* More cleanup and add instruments
* adjust usage of getReverseReplacementSeq
* Changes from feedback and prefix external methods with SfxEditor
Co-authored-by: RaelCappra <rael.cappra@gmail.com>
* Implement hint for dungeon type on Map get item messages
* Color dungeon name in item tracker when MQ and map is found
* No hint when all dungeons are MQ or non MQ
* TWEAK: French hint
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
* Adds most visuals and interactions for quest select menu.
* "Scrolling" menu, adds remaining sub/title textures, language support
* Tweak: ENG, FRA, GER title to match the original style
* ADD: Randomizer tex
* TWEAK: Randomizer ZAPD extension format
* Adds control stick prompts to the "scrolling" menu.
* Adds third entry for Randomizer.
* Bold text on randomizer subtitle.
* Ensures the game won't allow selecting an unsupported quest.
* Makes save files be created from the quest menu selection.
* Removes the master quest and randomizer checkboxes (no longer needed).
* Removes lock on MQ-only rando.
* Skips quest select if only one quest is playable.
* Adds ability to back out of quest select menu
* Show seed icons while Randomizer is selected on Quest Select Menu.
* Fixes custom hud colors and d-pad navigation.
* Implements backing up from name entry to quest select.
Also implements backwards rotations on the file select screen.
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
* fix lacs hint text coloring and new lines
* missed a new line
* fix wrong control code
* TWEAK: French LACS + Vanilla
* more french hint fixes
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
* Fixes saving `isMasterQuest` and fixes default values for rando sliders.
* Changed slider default values
* Fixes default dropdown values for Ganon Trials and MQ Dungeons.
* Ensure's consistent default values are used for all `CVar_GetS32`'s
* Refactor GetCheckFromActor, WIP currently broken
* Fixes build errors via forward declarations and emplace vs insert.
* Removes some unnecessary code.
* Fixes non-windows build errors.
* Fixes Deku Scrubs outside of grottos.
* Fixes DMC Deku Scrub Grotto Center
* Fixes Ruto Blue Warp
* Fix issue identifying blue warp rando checks
* Move identifyCow to randomizer.cpp
* Various updates to vanilla check objects
* Identify MQ checks in check object table
* Adjustments to how multimap is used and initialized
* Convert u16 in check object table to s16
* Fix a few issues with MQ checks
* Fix issue with TWO_ACTOR_PARAMS macro
* Fixes some scrubs and cows appearing as identical.
* Fixes known gossip stone issues (ToT, DC)
* Fixes Dampe's Gravedigging tour rcObject
* Fix crash on locations tab
* Enable master quest dungeons in rando
Co-authored-by: Christopher Leggett <chris@leggett.dev>
* Add command for giving item as if it was given from an actor
* Add modID argument to give item command and add give from skull command
* Adjustment and remove skull option since this isn't pointed at rando-next
* Fix string compare
* Add Cheat for disabling age check on equipment
* Add Cheat for disabling age check on equipment... pt 2
* cleanup some logic with macros
* Keep adult strength as child & prevent equipment greyout
* Timeless Equipment cleanup
* Add toggle option for walk speed modifiers
* Preserve toggle status between scene transitions
* Apply suggestions from code review
renaming from `gSpeedToggle` to `gWalkSpeedToggle`
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* Updated starting age restrictions;
patched specific circumstances in 3d rando
* cleanup some testing stuff
* whoops
* become Sherlock Holmes; tooltip cleanup
* Explicit logic for forcing child age
* Apply bria's suggestion
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* Implement most of chest size and texture matches contents, just need an item table
* Add GetItemCategory to getItem tables
* Revert changes that tie chest size and texture to randomizer
* Support chest size & texture as an enhancement that works on outside of rando
* Add gChestSizeAndTextureMatchesContents to rando preset
* Prevent gChestSizeAndTextureMatchesContents in chest minigame
* Fix for forest temple boss key chest
* Add options for texture or size only
* Fixes a few bugs I introduced for MQ file select screen.
- MQ Saves could not be loaded while only an mq otr is present, because `requiresOriginal` was true when `gSaveContext.mqDungeonCount` was less than 12. That value only ever gets set for rando saves, so I added a check for the rando flag to that conditional.
- The rando tag was not getting grayed out with the rest of the save file.
- Some necessary meta info wasn't getting loaded when the randomizer CVar was off. Removed that check so that the rando save data always gets loaded during InitMeta. That way the amount of mq dungeons can be checked for validity with the loaded set of OTRs even if randomizer isn't enabled.
* i not 1
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* Re-enables OTR patches from mods folder.
* Don't error if an OTR doesn't include a version file
Just info log and continue. If the patch fails to apply then we can error, and SoH can do it's own validation later.
* Fixes small error on my side
* Support for patching DLists outside of OTR, mostly for cosmetics and bug fixes
* Store original dlist instruction for unpatching
* Rename sandstorm patch variable
* Use unordered map for originalGfx;
* Add mirror shield option to the cosmetics menu
* Include GI model for mirror shield
* Changes from feedback
* Changes OTR Extraction to have specific mq and nonmq paths.
Also updates the game to load resources according to whether or not
Master Quest or Vanilla is loaded.
* Removes unneeded code from the last commit.
* Fixes some weird formatting in ZRom.c
* Loads oot-mq.otr and patches oot.otr on top, if both are present.
If only one or the other are present, it becomes the only and main OTR.
* Adds ImGui Logic for whether or an MQ Checkbox.
Checkbox checked only specifies whether new saves should be MQ or not.
Checkbox is disabled or force-enabled according to which OTRs are loaded.
Also as a necessity includes tracking what game versions have been loaded
from the OTRs.
* Adds MQ settings logic for Randomizer's ImGui menu.
* Writes Master Quest dungeons to the spoiler log
* Loads MQ Dungeons from spoiler, persists in save, and loads when appropriate.
* Adds logic to prevent loading or creating incompatible rando saves.
* Fixdes some linux build issues and new rando save issues
* Makes appimage create both vanilla and mq otrs
If either rom is present, it makes the corresponding OTR. If both are present,
it will make both. If one OTR is present but both roms are present, it will
create the missing OTR.
* Makes it so a randomized save file will not be marked as MQ.
* Refactors to load all OTRs from MainPath or a specific list.
Also adds the ability to take a std::unordered_set of hashes to
validate each OTR's version file against.
* Fixes a syntax error
* Makes ExtractAssets output Vanilla and MQ OTRs if both roms are present
* Fixes asset generation bug.
* Partially working fix for dual OTR extract_assets
Currently the cmake ExtractAssets target will return with a 1 if you
only end up exporting one type of OTR isntead of both. Haven't found
a great way to only attempt to copy a file if it exists from within
cmake. It does actually correctly copy the OTR that is generated,
despite the error from copying the other one.
Pushing as is for now but will keep investigating.
* Adds oot-mq.otr to the gitignore.
* Makes ExtractAssets not fail on only one rom/OTR.
* Removes PatchesPath from the constructors requiring OTRFiles vector.
* Renames OOT_UNKNOWN to just UNKNOWN to remove OOT specific reference.
* Removes randomizing MQ Dungeons and re-disables MQ rando.
Doing this so the PR can get merged quicker with just the Dual OTR
support and won't need to wait on rando logic to be updated. That
will happen in another PR directly after the merge.
* Update mac startup script for dual otr
* Update soh/macosx/soh-macos.sh
* Update soh/macosx/soh-macos.sh
* Update soh/macosx/soh-macos.sh
* Implements new BinaryReader to fix Linux build issue.
BinaryReader itself comes from https://github.com/Moneyl/BinaryTools
I added a wrapper to adapt it to the ABI from ZAPD's Binary Reader and
add Endianness checking. I also had to copy a handful of other bits and
pieces from ZAPD to make it all function as expected.
* A few edits to the updatream BinaryReader to compile it on Linux.
* Adds the Endianness to the first byte of the version file.
* Fixes Jenkins
* Addresses some of Kenix's comments
* Renames `ReadNullTerminatedString` to `ReadCString`
* Refactors Archive::LoadFile into a private method with more arguments.
* Removes BitConverter and extends existing endianness.h instead.
* Fixes an endianness issue with the version file.
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
* Support for patching DLists outside of OTR, mostly for cosmetics and bug fixes
* Store original dlist instruction for unpatching
* Rename sandstorm patch variable
* Use unordered map for originalGfx;
* Add golden gauntlets to Cosmetics Editor
* Removed extra space
* Fixed comment
* Changed comment again (helps if you save the file before committing)
* Add: Randomized Ice Trap Messages
* Add text to freestanding items, other tweaks/fixes
* More messages
* ADD: French Translation + 1 Extra
* %w is not %UwU%
* TWEAK: One msall breakline
* Add German & small text tweak
* Minor code optimization
* Updated French
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
* Start effects
* Disable input to game when typing in console
* Add gravity support
* noUI placeholder
* Add rest of effects to console
* Remove z_play code
* Add rupee modification
* Add OneHit KO (#27)
* few fix and paper Link
* Better method and now use the reset flag
* Revert "Better method and now use the reset flag"
This reverts commit 2aafcc1df2.
* Revert "few fix and paper Link"
This reverts commit 65e76dcfee.
* Paper Link & few fixes (#28)
* Implement pacifist mode (#30)
* Implement cucco storm (#31)
* Add no UI functionality (#32)
* Enable CrowdControl on windows (#33)
* Use std::format and implement wallmaster
* Implement defense modifier
* Implement no_z and clean up
* Implement reverse controls
* Some fixes while testing CC connection
* Implement speed modifier and fix defese modifier
* Fail magic effects if magic is not acquired
* Fix queue system
* Implement rainstorm
* Some cleanup
* Use IS_ZERO to handle very low near zero values
* Split some effects
* Fix emptying magic
* Don’t run cucco on pre-rendered backgrounds
* Use correct method for updating ruppees
* Fix decreasing speed
* Remove old SDL stuff
* Remove old fixes
* Enable Crowd Control for both debug and release
* Add missing returns
* Cleanup event firing
* Further clean up on event firing
* Fix some bugs
* CC fixes and enemy spawning (#35)
* Fix icetraps
* Fix title screen
* Fix pause screen
* Fix death screen timer & Code cleanup
* Fix timer during textboxes
* Code cleanup
* Add: Multiple enemy spawning
* More enemies + more code cleanup (#36)
* Enums for returning effect states
* Add more enemies
* Update CrowdControl.cpp
* Remove enums from enemies
* Fix up flow for events (#37)
# Conflicts:
# soh/soh/Enhancements/crowd-control/CrowdControl.cpp
* Fix spawn position of likelike
* CC temp enemy fixes (#38)
* Check for pause in pacifist and allow button presses (#39)
* Fix Pacifist mode (#41)
* First attempt pacifier fix
* Real fix for pacifist mode
* Comment
* Remove cutscene and long delay from cucco_storm (#40)
* Some PR Fixes
* Use standard types
* Handle JSON parsing error and free memory
* Add CC configuration file
* Add: Giving deku shield option. Fix: Giant Lonk (#42)
* Small stalfos fix (#43)
* Syntax Improvements (#44)
* Revert bools to uint32_t
* Add comment about bools
* Fix cucco storm, fix empty heart (#45)
* Protect commands vector with mutex
* prefix effects with chaosEffect (#46)
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: Baoulettes <perlouzerie@hotmail.fr>
Co-authored-by: aMannus <mannusmenting@gmail.com>
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Co-authored-by: briaguya <briaguya@alice>
This was caused by the trail duration not being init properly until we change the duration manually.
cf this video: https://streamable.com/a9u4fm
- Also changed Lengh to Duration for clarity
* FIX: Set back default comportment of some Views
- Renamed Auto-Center First Person View to Disable Auto-Centering in First Person View and make it necessary to be checked to take effect and not being active by default
- Disable gInvertYAxis being enabled by default (which it not vanilla)
* Tweak: small whoopsie
* WiiU: fix more scaling issues
* Wii U: batch depth reads
* Wii U: remove file buffering
Doesn't seem to to do much anymore
* Remove "missing_gcc_functions.c" to avoid conflicts
* Wii U: Fix random_device usage
random_device will always be seeded with a constant seed and will return the same number sequence every time
* Wii U: Improve software keyboard
* Wii U: Fix console input text width
* Fix X11 being searched for on macOS
* Add ability to switch audio backends
* Fix issues with c arrays of std dynamic size items
* Fix old uses of sizeof()
* Remove current selected option from list
* Don’t show items if we only have one option
* Revert changes to GetItemFromGet
* Fixes Ganon's Boss Key shuffled while regular boss Keys aren't.
* Enum + combo box
* Add obtainability checks correctly
* combobox title rename + no number tracking
* Fix repeatable purchases and bottles rendering incorrectly
* Move shopsanity option in GUI
* Struct instead of ImVec + basic comportment for all case
* Attempt to fix odd build issue
* Cast randoGet for ganons boss key
* Remove redundancy in KD room
* Update logic Cvar names
* Fix Ganons Trials coming from old save files. Fixes#1365
* Fixes crash when entering Ganon's Castle lobby on linux.
* Makes `Item_Give` safe to use with a NULL globalCtx.
This should allow it's use for giving items to Link's Pocket
during rando save initialization.
* Converts Song from Impa to use `Item_Give`
* Adds more options for Link's starting item.
* Removes unneeded `GiveLinkItem` functions.
* and make it build
* bring back new rando dropdown
* gSaveContext access in GameMenuBar.cpp
* Implement Skip Scarecrow's Song
* Reimplement progressive Bombchus
* Rando-next: Deku Nut and Seed ammo gives a blue rupee
Fixes#1390
* Fixes Link starting with BGS
* Persist item tracker notes
* Adjust Hooks include
* Use SohImGui::RequestCvarSaveOnNextTick
* Fix issues from LUS refactor
* Fix for overriding deku scrub messages
* Fix mistake from merge
oops
* Restore checkboxes to enhancements menu
These got lost in the merge
* Update location access logic
Including MQ locations in Spirit and GC now
* Implement rando bombchu drops
* Missing break
* Simplify mudwall collision check
There was no need to have a second collider specifically for Ice Arrow hits
* Update settings.cpp
* Simplify mudwall collision check
* Restore checkboxes in menu
Accidentally lost these during merge
* Clean up bool
* Update logic Cvar name
* Fixed capacity on ammmo tracking
* Fix for beans obtainability
* Hook into file delete and clear notes
* Incorporate magic arrows in rando settings
* Update tooltip
To inform the player that they might have to reload the room if they're enabling this for the first time.
* Update tooltip
* Add line break in tooltip
* Tooltip wording + line break
* tweak on main logic
* All color logic for all types
* Fix: changes to please new LUS
* Ensure itemTrackerNotes vector is not fully empty
* Implement's Tycoon Wallet.
* Refactor DrawItemCount and Use EnhancementCombobox for tracker capacity options
* small tweaks and rename
* always display XX/YY when in ammo/capacity mode
* Move all merchant messages to be generated on file load
* added hovertext for the number display
* Swap german and french translations for shop messages
* Set key colors to be on by default
* Add another flag to skip mask shop
* Fix Sold Out bug
* Fix gerudo keys, add disabled checkbox
* tooltip line break
* Add trials required and merchant prices to save file instead of loading from active spoiler log
* Remove trialsRequired persisting in save manager
* Adds slotIndex to girla (shop item actor) and uses that for IdentifyShopItem.
* Fix issue when merchantPrices is empty
* Fix for a single zeroed merchantPrice entry
* Fix#1417
* Implements items selling out and fixes issues with purchasing some items.
* Fixes order of operations so Rupees will be spent.
* Fixes sold out items not getting overwritten by the randomized info.
* Clarify var names and comments
Also preserve chain platform cutscene in spirit based on Link's position
* Remove !=0 from cvar check
* Clarify var names and comments
* Rename randomizerMerchantPrices to merchantPrices
* Handle shop items in SaveManager
* Fix merge mistake
* Base whats in the bazaar shop on entranceIndex instead of age
* Tidy up chain platform cutscene check
* Fix merge error
Didn't mean to have Zhora changes in here yet
* Use 3drando item table for parsing spoiler names
* Use another nested method instead of one at the top level to fetch the table
* Add missing newline
* Remove log
* Respect custom draw functions
* Fix issues with rendering songs
* Fix localized item names for shopsanity
* Implements a larger array of Sprites for the Icon Hash.
* Uses the hash instead of seed for spoilerfile name and icons.
* Removes some unused functions and variables in `spoiler_log.cpp`
* Prevents leading 0s added to hash from being in file name
* Changes filename format to icon indexes separated by dashes
* Hopefully makes Jenkins happy
* Hopefully makes Jenkins happy
* [Rando] Child Gerudo Fortress 37th Heartpiece randomized
Fixes#1071
* Add descriptions to save editor flags editor, and added randomizer flags (#1386)
* Add descriptions to save editor flags editor, and added randomizer flags
* Hide randomizer flags when not on a randomizer save
* Move flag descriptions to header file
* Update soh/soh/Enhancements/debugger/debugSaveEditor.h
* Update soh/soh/Enhancements/debugger/debugSaveEditor.h
* Fix merge error
* crash on pause menu on linux (only in appimage)
Fixes#1437
* Applies fix to Song from Impa as well.
* Allow buying tunics as child when shopsanity is on
* Fix for custom draw methods overriding sold out sign
* Simplify logic around shopsanity and fix some issues
* Fix dungeon reward stone rotation and add particles
* Fix some issues with ice traps
* Fix adult wallet having its own max capacity
* Fix amount of keys given for BotW
* format
* Use EnGirlAShopItem enum instead of raw hex values
* [#1434] Renders non-warp songs more consistently with warp songs
* A few changes around merchant messages
* Various changes from PR feedback
* Rando: Junk Hint missing french translation
* Typo
* Fix free scrub being at 0 instead of TEXT_SCRUB_RANDOM
* Replace magic numbers in message handler
* Update soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* Update soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* Fix BGS softlock for shopsanity
* Support tycoon wallet on tracker
* Revert "Fix BGS softlock for shopsanity"
This reverts commit 5fdb961ea4.
* [#1053] Resolves an issue with shop items and bombchu bowling where BGS would display two message boxes
* Implements some necessary plumbing and resolves several Ice Trap Softlocks.
Adds a way for an item entry to tell what type of check it came from (NPC vs Chest vs Freestanding, etc.)
Sets this value from chests and item00 actors.
Relocates pendingIceTraps to save context so it can persist through cutscenes and get stored on save init for Link's Pocket and Song from Impa.
Restructures pendingIceTraps into a counter rather than a true or false, so that we can be frozen multiple times in a row if applicable (atm that should only be at the start of a run if Link's Pocket and Song from Impa were both Ice Traps).
Adds a textbox for Ice Traps and a special case of holding up nothing in the get item process. This fixes all the cases where Ice Traps would softlock due to the actor giving the item expecting a closing textbox. After holding the item above his head Link increments the pendingIceTraps counter by one and sets whatever flag he has pending.
None of the above plumbing applies to Ice Traps from chests, those work exactly the same as before, as do freestanding item00 ice traps (thanks to the additional check for ITEM_FROM_FREESTANDING.
OoT and Ruto's Letter count as NPC's, so they get the FOWL text box and set a pending ice trap rather than immediately freezing, since Link weill be in the water. Link will get frozen the next time he touches land, which in the case of OoT is after the fade to white and right before the Song of Time check.
Fixes all the other softlocks I'm aware of, including Fishing, Bombchu Bowling, Skull Kid, and losing the second Gerudo Archery check.
* fix bgs check in player
* move bgs logic for tokensanity into MOD_NONE check
* set bgs flag before `Item_Give`ing
* move bgs flag into `MOD_NONE` check in girla
* use existing check in `z_player`
* Adds comment explaining the decision to default ITEM_FROM_NPC.
* Rename pendingIceTraps to pendingIceTrapCount
* Adds some RANDOTODO comments about cleaning up a couple things.
* Merge branch 'develop-zhora' into ztornn
* manually restore changes to `z_player.c`
* Fix after some ice trap prepwork from earlier
* Actual fix
* Woops
* More rupee names
* Actually fix it
* Add back comment
* Fix Skip Scarecrow Song
* Fix ruto's letter and LH sun stick rendering
* Also fixes it for treasure chest game
* Tweak: Rando French Wallet
* ADD: French Tycoon
* Hide dungeon items/notes by default
* [#1301] Fix issue with UI not restoring after getting an item from biggoron
* Update soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
* Update soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
* Fix random crash that only affected one person for some reason
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
Co-authored-by: Christopher Leggett <chris@leggett.dev>
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
Co-authored-by: Sarge-117 <adam_branston@outlook.com>
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: aMannus <mannusmenting@gmail.com>
Co-authored-by: lil David <1337lilDavid@gmail.com>
Co-authored-by: Sarge-117 <108380086+Sarge-117@users.noreply.github.com>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
* Add cheat for easy pause buffering
* Add pause input buffering
* Fix pause input buffering
* Changes from feedback
* Convert frame to bool
* Handle when pad is nullptr
* Add newline
* Split input buffering into it's own CVAR
* Split SetShouldBlockGameInput up into to methods
* Fix Trails, add more Trail Customization
* 3d Bombs; Bombchu now glow custom trail colors
* 3D Seed/Nut Model, Separate Sword Slash Colors
* Removed 3D Seeds/Nuts; Don't work properly
* restored previous removal of sword blur code
* Remove things not related to Trails
* Remove fix to random color code
* Fixes crash handler for jenkins builds.
We must include the pdb in redistributables.
* Properly selects PDB file path for inclusion
Co-authored-by: Christopher Leggett <chris@leggett.dev>
* Add magic arrow enhancements, non-rando
Changes to red ice actor, sun switch actor, and mudwall actor to adjust their collision
* Update tooltip
* Simplify mudwall collision check
* Restore checkboxes in menu
Accidentally lost these during merge
* Update tooltip
* Add line break in tooltip
* Clarify var names and comments
Also preserve chain platform cutscene in spirit based on Link's position
* Remove !=0 from cvar check
* Missed a couple
* Clean up chain platform cutscene check
* Reorders switch statement to prevent some code that shouldn't execute.
* Potentially fixes bottleable entities crash
* Solves lack of ItemEntry for GI_MAX
* Adds comment clarifying new GetItemEntry
* Added Skip Scarecrow Song
Added in the option for if the user has the time saver for Scarecrow song enabled and has their Ocarina pulled out in range of Pierre.
Added Skip Scarecrow Song
New enhancement under time-savers that allows the user to only pull out their ocarina to summon Pierre.
* Added Default for Scarecrow summon
The scarecrow summon option now defaults to 0 and can be turned on individually. I haven't included it in any other presets so people don't feel like they're cheating.
* Checks if scarecrow song is in possession
* Fixed positional Scarecrow logic
* Fixed style
* Adds inversion options
* Fixes compilation
* Adds options to new detailed control editor
* Fixes inversion on C-Up view
* Fixes right stick aiming
* Fixes right stick aiming again
* Adds tooltip function + tooltips to gamecontroleditor.cpp
* Fixes tooltip for X axis
* Uses LUS tooltip function instead of new one
* Adds padding to camera control editor
To fit more in line with other enhancement checkboxes
* Adds ItemTableManager class.
* Implements new getItem table in game.
* Adds rando item table and way to differentiate tables in GetItemEntry.
* Adds rough ability to differentiate between rando and vanilla items.merge stashed changes from before develop-zhora merge
* Change ItemTableID to be uint16_t so we can use ModIndex for it.
* Should fix switch build
* Should fix switch build pt 2
* Adds new files to CMakeLists.
* Implements fixes for competing getItem calls.
* Correctly renders freestanding items
Particle effects are probably broken, need to fix them still, I pretty
much know how I would do that.
* Fixed Particle effects in the new getItem system.
* Fixes item fanfares
* Partially fixes Ice Traps
Obtaining a freestanding Ice Trap causes link to slide forward
and receiving one from an NPC plays the sound effect and damage
animation but doesn't freeze link.
* Some more partial ice trap fixing that wasn't pushed earlier
* Removes unused function override
* Replaces ::find with ::at and adds exception handling
* Removes some commented out code.
* Refactors rando's GetItemEntry array into two arrays.
One array is for the vanilla items that don't have GetItemEntries in
vanilla, the other is for rando exclusive items. They are stored in
separate arrays before getting added to the table so that we can apply
different modIndexes. The items in the first table have are handled
by the vanilla Item_Give, and the second table needed a custom
`Randomizer_Item_Give` function.
* Renames, relocates, and implements ModIndex enum.
* Removes now unused ItemIDs and GetItemIDs
Also makes all the necessary changes to other code that was still
using them indirectly through the GI to GID map that was removed.
There's quite a lot of changes here and I haven't had time to test them
yet.
* Re-implements GIMESSAGE_UNTRANSLATED as macro
* Removes commented out function.
* Throws exception if an invalid itemID is used
Addresses https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r943694857
* Removes ARRAY_SIZE in favor of ARRAY_COUNT
ARRAY_COUNT already exists in `macros.h`, I just didn't find it before.
Addresses https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r943153833
* Inverts CheckContainsRandoItem to CheckContainsVanillaItem.
Addresses https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r940895135
* Cleanup, bugfixes, removing the `- 1`s from `z_player.c`
* Fixes some funky formatting that got committed earlier.
* Adds else if to added fanfare sound cases.
Addresses https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r940112924 and https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r940113492
* Extends GetItemEntry to include getItemId
Also adapts some existing calls for both the entry and the id to only
get the entry.
* Extends GetItemEntry to include GID.
This allows for using it later when drawing freestanding items.
Addresses https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r943168136
* Rando-specific items use new textId again.
This got lost when merging develop-zhora in because I didn't have custom
messages merged when I started this.
* Sets global modIndex to MOD_NONE on scene load
Fixes a crash when buying items in shops due to them
not triggering the rando code that normally sets these items.
May have also been crashing vanilla playthroughs.
* Realized I had the bgm conditions wrong.
* Fixes "static drops" (i.e. sticks from withered babas)
* Fixes LACS/Prelude situation... again.
* Fixes too many arguments error.
Not sure why this didn't fail to build on Windows before.
* Fixes Link's Pocket items.
* Simplifies sram init for rando-specific items
* Fixes issues with approaching bottleable items.
* Fixes Ruto's Letter.
It was accidentally getting classified as a rando item.
* Should re-fix freestanding ice traps
* Makes freestanding items set player->getItemEntry.
This prevents freestanding items from setting the global modIndex.
This is part of a larger transition that needs to happen to switch
to setting getItemEntries for all of the rando items. This prevents
some things that set getItemId of GI_MAX from granting a Fire Medallion
when the global modIndex is MOD_RANDOMIZER.
* Makes sure we aren't using getItemEntry when not randoed.
* Replace Randomizer_GetRandomizedItemId with Randomizer_GetRandomizedItem and Randomizer_GetItemIdFromKnownCheck with Randomizer_GetItemFromKnownCheck
* Introduce some new methods and migrate most actors to them
* Fixes ocarina game skull kids to set player->getItemEntry
* Sets `z_en_box.c` to set `player->getItemEntry`
* Fix logical errors and migrate most of the rest of the rando checks to GiveItemEntryFromActor
* Use GiveItemEntryFromActorWithFixedRange in item00
* Fixes Anju to set player->getItemEntry.
* Add a few missing cases
* Additional fix for Skull Kid
* Fixes vanilla ice traps and randomized ice smoke
* Fixes rendering of treasure chest game items.
* Removes unused `Randomizer_GetItemIdFromGetItemId`.
* Cleans up an if statement for item00.
* Cleans up another if statement in item00
* This should fix a bug with the Gerudo Archery minigame.
I wasn't able to get the bug to happen after making this change.
* Documents our new GiveItemEntry fuctions.
* Uses more descriptive type name for ItemIDs for creating custom messages.
* Fixes potential issue with if statement.
* Fixes missed type change.
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
* Merges GlobalCtx2 and Window classes.
* Includes condition variable in File.
* add mac specific include
* sstream to get past "implicit instantiation of undefined template" error
* switch/wiiu includes
* that file doesn't exist
* more wii u globalctx2 stuff
Co-authored-by: briaguya <briaguya@alice>
Renames VirtualController to DummyController.
Makes controller axis treated the same as buttons.
Made Controller class members private or protected
Made Controller class treat deadzones, sensitivities, and press thresholds consistently.
Properly routes SPDLog to the console.
Creates an API to be able to send command responses back to the console.
Cleans up the console UI, hiding options when not needed.
Removes stdout console sink for Windows.
* First pass of UX changes
* More padding/styling/layout
* More styling
* Moar styling
* Some more styling
* Implemented padding helpers
* More styling, added closing buttons to windows
* Fixed merge conflict mistake
* Fixed new enhancements
* Hopefully fix jenkins errors
* Changed button behaviour, more styling
* Tiny code cleanup
* Change buttons from close/open to > when open
* Small button spacing fix
* Small styling changes after merge
* Small fix after merge mistake
* Skip Jabu Jabu's fishy feeding time if rando is enabled Issue #757
Also skip the ganon tower fall cutscene if you died to ganon during the ganon fight for issue #773
* Immediately give control back to player when talon running cutscene starts.
* Fix case of not skipping Gannon
* Automatically save after every scene transition
* Refactor and don't save in grottos
* Don't save in cutscenes
* Save after getting items as well
* Fix paren
* This should fix (all?) 60fps interpolation issues left.
Resolves#631#917
* Update z_fishing.c
* Re-adds Emil's interpolation in certain places.
* move open/close disps out of if statments checking timer based vars, revert fishing to use recordopen/closed child
* move disps out of ifs for morpha
* use recordopen/recordclose for volv
* recordopen/recordclose for ganondorf
* switch back to recordopen/recordclose for ganondorf floor
* Frame interpolation now uses a 64bit parameter rather than 32.
* More 60fps fixes
* Fix close child typo
* add todo calls to recordopen/recordclose
* fix build
* revert long long frame interpolation
* add some epochs
* add more epochs
* bongo epochs
* the rest of the epochs
* fix the typo fix the build
* interpolation fixes pr cleanup
* init/cleanup bongo epochs
* bongo hand trails
* Fixes niw feathers
* Fixes bongo bongo hands, and replaces epoch * i with epoch + i
* don't update epochs
Co-authored-by: briaguya <briaguya@alice>
* added Cheat Sync Time
This syncs the ingame time with the real world time.
I wasnt quite sure where to put the code so im sorry if this is bad i just wanted to contribute to this project.
* Update soh/src/code/z_play.c
Co-authored-by: Christopher Leggett <chris@leggett.dev>
* Update z_play.c
added suggestions from leggettc18
* Update z_play.c
Co-authored-by: Christopher Leggett <chris@leggett.dev>
