* Add version control for Rachael saves and old rando saves.
* Change spoiler drop success sound to puzzle success chime.
Add spoiler drop fail sound (sys_error).
Improve path sanitizer operation.
Add check for a spoiler having a version and it equaling running version. Deletes spoiler CVar if spoiler becomes unusuable while running, and prevents loading dropped spoilers that don't match.
* clang
* Remove backslash escaping from Sanitize.
Remove duplicate Sanitize from Context and make it use SohUtils.
Fix typo.
* Rearrangement of the currencies in randomizer.cpp
* Rearrangement of the currencies in randomizer.cpp
* Rearrangement of the currencies in randomizer.cpp
* Rearrangement of the currencies in randomizer.cpp
* Rearrangement of the currencies in randomizer.cpp
* Rearrangement of the currencies in randomizer.cpp
* Rearrangement of the currencies in randomizer.cpp
* Rearrangement of the currencies in randomizer.cpp
* Rearrangement of the currencies in randomizer.cpp
* Rearrangement of the currencies in randomizer.cpp
* Rearrangement of the currencies in randomizer.cpp
* Rearrangement of the currencies in randomizer.cpp
* Fix issue where random and clear seed buttons overlap text input.
* Fix issue where item scale is incorrectly disabled.
On fresh json, there was a mismatch on the defaults where SGIA_JUNK was default for the actual
combobx but SGIA_DISABLED, was used as the default when the CVar was checked in the scale slider's
PreFunc.
* * fixes softlock when talking to Mido without Kokiri Emerald after killing Gohma
* * moved scene check to hook
* moved vanilla conditioon into GameInteractor_Should
* * corrected hook condition
* removed 'this'
* * reverted GameInteractor and hook_handlers
* changed actor to use existing hook
* * updated kokiri emerald conditions
* * missed parentheses
* * Overworld pretty much done.
* Known issue with Market Night + 2 bushes in KF
* Known issue with Adult bush in ZR
* * fixed locations post-merge
* * renamed option and types to 'GRASSANITY'
* changed grassnity to be a combobox option
* added first 5 deku tree locations
* * color is a sickly green when containing a check
* added ZR 14 (adult only bush on the platform, not the same?)
* * forgot to rename the files to grassanity
* updated draw method to fix regrowing grass
* Removed old WIP locacc files
* * removed comments in bush actor
* added rest of Deku Tree plus MQ
* Added DC + MQ
* Fixed DC incorrect pos value on 1 loc
* JJB done minus after big octo
* Added BotW + MQ locs
* WIP grottos
* Grottos done
* Workaround to allow market grass during night
* Seperated the 2 KF bushes into 4 checks
* Hints and additional formatting
* Slightly less ghastly color
* Corrected the 2 JJB locs
* * Renaming and removal of some locs.
* Restructure in z_en_kusa.c to leave vanilla code alone.
* Formatting.
* * see previous (forgot to stage woops)
* * Clear grassIdentity on item drop
* Added check for RC on RandoDraw function
Results in no extra dupe drops, and instantly correct the color of the grass when cut instead of on collecting the item.
* * fixed dupe location spoiler names which caused occasional crash when writing spoiler log
* * reverse should
* * fixed faulty locations
* * corrected KAK location names and some formatting
* * Fixed market bushes by tree not working at night
* * merged ZR near PoH grass into a single loc
* * Changed to ShipInit (might be missing something?)
* Corrected Should in z_en_kusa.c to use original draw func when setting is Off
* * Renaming to Shuffle Grass
* * minor fix
* * keyboard fail lol
* * suggestions
* * removed unused function
* * move grass locations into ShuffleGrass
* move grass GameInteractor into GIVanillaBehavior
* minor fixes
* * pre-removed locs from dungeon.cpp
* * pre-remove from context.cpp
* * re-added Grass to context
* * added Dana's amazing custom bush models
* using CSMC to display flowers based on "contents"
* * added Dana's grass models
* refactor to lessen the clutter in the switch
* * removed fairy case
* Added back missing Deku Tree locations
* formatting
* Update soh/soh/Enhancements/randomizer/location_access/overworld/zoras_river.cpp
Co-authored-by: Philip Dubé <serprex@users.noreply.github.com>
* re-added suggestion from previous
* removed wrong line >.>
---------
Co-authored-by: Philip Dubé <serprex@users.noreply.github.com>
* Additions and fixes for the German translation in item_list.cpp
* Additions and fixes for the German translation in hint_list_exclude_dungeon.cpp
* Additions and fixes for the German translation in hint_list_exclude_overworld.cpp
* Additions and fixes for the German translation in hint_list_item.cpp
* Additions and fixes for the German translation in randomizer.cpp
* Additions and fixes for the German translation in randomizer.cpp
* Fix for the French translation in item_list.cpp
* Additions and fixes for the German translation in hint_list_exclude_dungeon.cpp
* Fixes for the English text in settings.cpp
* Fixes for the English text in SohMenuEnhancements.cpp
* Fixes for the English text in SohMenuDevTools.cpp
* Fixes for the English text in SohMenuRandomizer.cpp
* Fixes for the English text in ResolutionEditor.cpp
* Fixes for the English text in enemyrandomizer.cpp
* Fixes for the English text in gameplaystats.cpp
* Fixes for the English text in savefile.cpp
* Fixes for the English text in enemyrandomizer.cpp
* Fix for the English text in SohMenuEnhancements.cpp
Co-authored-by: aMannus <mannusmenting@gmail.com>
---------
Co-authored-by: aMannus <mannusmenting@gmail.com>
* Multiple Rando Text related stuff
- Mostly french rework / completion of missing lines
- Removal of a duplicate entry for Richard's house overworld key
- Correct naming for the English pond
- Addition of missing text in English and french
* Txeak uncessary spaces
* Add menu files, hook menu up to window system.
Temporarily rename new menu's UIWidgets to UIWidgets2 to allow both menu systems to coexist temporarily.
* Finish implementing new menu.
Rename 2ship UIWidgets to UIWidgets2 to complete facilitation of both menus working for now.
* More preliminary setup
* More prepwork, begin on settings options
* Finish settings, add enhancements windows
* Fix search function not looking past first columns.
* Add dev tool windows
* Finish dev tools
* Add about window
* Fully replace about window
* Remove moved menu items from menubar, add more windows to new menu
* Implement WindowButtonOptions.
Add ability to not embed popout windows when not popped out.
Add ability to hide the button for WindowButtons.
Fix Entrance Tracker from showing when not enabled.
* Fix entrance tracker settings embedded display.
Fix entrance tracker settings window original size declaration.
* Initial implementation of themed radio button widget.
* Move "About" section to second column of general.
Fix sidebar sections starting in second column.
* Restore Entrance Tracker `Draw()` to allow for custom styling.
* Fix combobox positioning formatting.
Fix color picker end spacing.
Convert everything in check tracker settings to UIWidgets2 (except color pickers and section headers).
Make all tracker windows not embed.
* Minor cleanup
* Fix main volume defaults & mirror jitter fix removal on dev
* Improve color picker with RGB/RGBA options. Not finished.
* Finish creating CVarColorPicker and implement for Check Tracker background color.
Fix tracker and network prefixes.
* Finish check tracker settings and convert check tracker.
* Port all Cheats menu except for Beta Quest
* Port over Beta Quest to new menu
* Remove old cheats menu
* Port cutscene skips to modern menu
* Port Timesaver Enhancements to new menu
* Port the Items and Item Count Messages submenu
* Port Difficulty Options to new Menu
* Removes options that have been ported thus far.
* Port "Reduced Clutter" options to new menu
* Add forgotten callbacks to Hyper Enemies/Bosses
* Copy StateButton to UIWidgets2, and implement custom padding for them in the tracker.
* Ports some pause menu related settinga
* Change tracker window active title color.
Make state buttons smaller in tracker to get more info on screen.
* Convert window title active theming to all windows.
* Port the rest of Enhancements->Gameplay to new menu
* Port the "Graphics" Enhancements to new menu
* Ports Fixes over to the Modern Menu
* Ported Restorations to Modern Menu
* Ported Extra Modes to new menu
* Port Autosave and Boot Sequence to modern menu
* Cleans up some leftover data for ported buttons
* Ports Enhancement Presets to new menu
* Port Additional timers to new menu. Removes Enhancements from old menu
* Cleans up some unused stuff
* Ports Randomizer Enhancements to modern menu
* Convert Item Tracker Settings. Something's wrong with the comboboxes in a second column of a table.
* Fix combobox alignment and label position calculations.
* Convert Entrance Tracker window.
* Save Editor Info tab finished.
Added `PushStyleInput` and `PushStyleTabs` for Info tab.
Fixed some indentation in entrance tracker source.
Added font push to tracker windows.
* Increase size of all icons in save editor.
* Convert flag groups to child windows for automatic sizing and border drawing.
* Flags tab completed.
Finished inventory tab.
* Convert save editor help hover to UIWidgets2.
* Various fixes and corrections
* Start cosmetics editor, fix theme colors not updating
* Cosmetics editor conversion progress
* Remove Mac internal resolution restrictions.
* Copy over advanced resolution partial and enable most options as a custom widget.
* Add size to float sliders, more cosmetics editor progress
* Fix incorrect cvar for notifications
* Radio button & header color options, more cosmetics editor progress
* Finish cosmetics editor conversion
* Create and apply THEME_COLOR macro. Resides in SohGui for easy access to mSohMenu.
* Move ResolutionEditor to SohGui directory.
* Add labels to build info.
Fix slider width calculations.
* Fix some advanced resolution widget hiding.
* Fully implement Advanced Resolution options.
Fix graphics settings formatting.
Improve slider label position calculations.
Implement Clamp options on sliders.
* Finish save editor.
Convert save editor code to `using namespace UIWidgets2`.
Fix search crashing on time splits window.
Remove `SetLastItemHoverText` from `UIWidgets2`.
* Unify cvar sectioning in time splits.
* Add InputString and InputInt widgets, and corresponding CVar Widgets
* Adds Widget Type for Inputs, not currently used.
* Convert Sail to modern menu
* Add Combobox that takes a vector of std::strings
* Convert checkbox and combobx to new widgets
* Add Tristate checkbox
* Convert sliders and tristate checkboxes
* Convert top half of Rando window
* remove/replace remainder of UIWidgets usage in option.cpp
* Converts tricks, locations, and removes old UIWidgets refs
* Fix windows build errors
* Remove Tri-State checkboxes
* Use PushStyleInput instead of PushStyleSlider
lol oops didn't realize it was a thing in Ship.
* Rebase and address review comments
* Convert Crowd Control to modern menu.
* Fix build error
* Audio editor progress
* Re-add CVar SaveOnNextFrame calls to Resolution Editor.
Remove old Resolution Editor files.
* Convert TimeSplits to new menu.
Fix a few enum warnings.
* Decrease padding on Arrow Buttons
* Audio editor + gameplay stats done
* Give Randomizer Menu more screen real-estate
* Port plandomizer menu
* Fix slider width calculation and allow combobox LabelPosition::None
* Fix None labelPos and slider width for inline labels
* Fix all slider value label insertions.
Convert Collision Viewer.
* Minor Collision Viewer enum change.
Convert Actor Viewer.
* Theme/convert Message Viewer.
* Add font to Message Viewer.
Theme Value Viewer.
* DL Viewer and SohModals themed.
* Convert Input Viewer.
* Missed some color settings in Input Viewer.
Removed UIWidgets references from Controller Config, and restored SoH version.
* Remove UIWidgets.hpp include from multiple files.
* Completely remove old UIWidgets.
Rename UIWidgets2 to UIWidgets.
Move Accessibility and Language options to new menu.
* Fix Gfx Debugger not showing up.
Remove menubar registration.
* Fix clearCvars references.
* Fix passing std::string to const char* argument.
* enum name spacing
---------
Co-authored-by: aMannus <mannusmenting@gmail.com>
Co-authored-by: Christopher Leggett <chris@leggett.dev>
* Autosave interval based
* Move to save on soft reset, remove adjustable interval
* Use new BeforeExitGame hook to prevent non-existent data problems
* Fix check tracker crash, remove BeforeExitGame hook
* update comment
* initial implementation of new models
* fix typo
* Add smaller skeleton key model and try to fix windows build
* stupid windows, you made me look bad!
* make DrawBombchuBag function work
* small cleanups
* OOGGA BOOGA BOO
* fix post merge leftovers
* post merge fix
* Added Big Key Lighting override to show vanilla lighting when unchanged
* rename CustomdLists into customIconDLs
* post merge fixes
* fix some tooltip issues
* post merge cleanup and some small menu changes
* post merge fix
* post merge fix
* add new boss soul model, colours broken
* update boss soul model for env support
* Add dungeon customise buttons to cosmetic editor
* fix mac build?
* keys don't support alpha
* fix submodules
* ring now draws
* fix keyring colours
* Add bombchu Bag RG, fix boss soul skull colour
* address reviews
* Basic restructure
* Undo most randomizerInf changes for now
* Small fixes
* Fix linux & mac builds?
* Fix remnants of randomizerInf changes
* Post-merge fix
* Post-merge fix
* Most of french rando message
* Should be all
* Plural
* Better wording
* forgot one
* Update soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp
Co-authored-by: Philip Dubé <serprex@users.noreply.github.com>
* Update soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp
Co-authored-by: Philip Dubé <serprex@users.noreply.github.com>
* Missing ones
---------
Co-authored-by: Philip Dubé <serprex@users.noreply.github.com>
* remove taking settings from a loaded spoiler instead of the imGUI settings
* actually fix most SpoilerLoad issues
* fix vanilla saves making future generations have so settings
* remove extra comment
* Initial mockup
* Rip out part of plando mode, implement rando settings menu
* MVP new randomizer flow
* Translation support and code cleanup
* Fixes and more cleanup
* Fix whoopsie
* Fix whoopsie 2
* Quick cleanup
* Re-add experimental tag
* Cleanup and small explanations
* Implement RT_DAMAGE_BOOST_SIMPLE & RT_HOVER_BOOST_SIMPLE
* Update tricks.cpp
* Move glitch status to a tag
* Fully remove the unused LENS & BKSKIP tags
* Enable some disabled tricks
* Add RT_ZF_GREAT_FAIRY_WITHOUT_EXPLOSIVES
* Potsanity proof of concept
* Hide pot item cutscenes for very frequent items
* Add 1 new pot to the item pool
* V1 custom pot model
* V2 pot model
* Pushing for help. lol
* Format clean up on added hint_list entries.
Removal of WriteIngameSpoilerLog call that was unneeded.
* THREE_ACTOR_PARAMS -> TWO_ACTOR_PARAMS and hints in a loop
* Lost woods pots logic
* Realign Pot Checklist in Location_list.cpp
* Correcting some values and adding Master Quest pots.
* Remove vanilla placements
* Re-order enums + start hints per region
* Fix build
* Break up shuffle pot options to dungeon/overworld/all
* Fixes
* Prepare default pot contents, fix/add dungeons
* Fix dungeon/overworld only settings
* Updates to Parameters and RHT information
* Remove unused hints
* Add proper check tracker entry exclusion
* Tweak items to skip cutscenes for
* Vanilla Drop List
* Update magic to blue rupees
* After merge fixes
* Fix Ganondorf's Lair pots
* Fix check tracker + minor stuff
* Unlock early GBK door
* Minor fixes
* More minor stuff and start of logic entries
* Fix TWO_ACTOR_PARAMS overlap between pots
* De-dupe defines
* Add missing water trial pot
* Update to develop-rando
* VBify pots progress
* Cleanup and fixes
* Overworld logic done
* Cleanup and fix item00 queues
* Implement skipping cutscenes for common items
* Revert "Implement skipping cutscenes for common items"
This reverts commit fe44916588.
* Ganons tower pot not spawning item fix + cleanup
* Fix ganon's tower, barinade, water temple pots
* VBify ganons key door
* Lizalfos Pot addition (example)
* Separate MQ pots in randomizerTypes.h
* Fix build
* Fix linux build (?)
* DC/Jabu/Botw/ start of Forest Pots (NMQ)
* Remaining Dungeon Non MQ Pot Location Logic
* After merge fixes round 1
* Post merge fixes round 2
* Apply MQ pot logic
* Re-align some stuff
* Cleanup, more work on locationlist
* Start of handling dungeon pots in item pool
* Finish dungeon pots in item pool
* GTG MQ Pots
* Review comments round 1 & code cleanup
* Fix ganon's lair pots being behind GBK in logic
* Update soh/include/z64actor.h
Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
* Update soh/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
* Address review comment
* Fix logic for pots in Fire Temple
* Fix GtG MQ pots, fix water temple pot logic
* Review Comments
* Logic review part 1
* Logic comments part 2
---------
Co-authored-by: Caladius <Caladius@users.noreply.github.com>
Co-authored-by: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
* Separate option values into context and menu indexes.
* Fix option index reference in `CleanCheckConditionString`.
* Update soh/soh/Enhancements/randomizer/3drando/location_access.cpp
Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
* Restore `const` classification to functions returning `string&`.
* Restore `const` classification to getter functions.
* Restore a couple more `const`s; cleanup header.
* Final consts; rename `SetCVar` to `SaveCVar`.
* Remove unused headers
* Move all "ResourceMgr_" functions to a new file
* Don't transitively include SaveManager
* Move cvar prefixes to a new header
* Add missing includes
* Update OTRGlobals.cpp
* Fix build
* Address review
* Fix some of the errors
* Update gameplaystats.h
* Update z_en_in.c
* Hopefully fix the linux issues
* Fix Linux issues for real this time, I checked
* Update ResourceManagerHelpers.cpp
* Update z_obj_mure2.c
* Post-merge fixes
* Fix build (hopefully)
* Post-merge fixes
* Update z_file_nameset_PAL.c
* cleanup some unnecessary headers (#7)
---------
Co-authored-by: Archez <Archez@users.noreply.github.com>
xxAtrain223