Pepper0ni
7d80d1c85d
Fix boss hints and gift from sages hint. ( #4634 )
2024-12-09 19:24:51 -07:00
Jordan Longstaff
f852d70767
Properly replicate NaviTalk kill check ( #4647 )
...
* Restrict disabled Navi workaround to Dodongo's Cavern
* Properly replicate NaviTalk kill check
* Move `*should = false` out of condition
2024-12-09 19:24:37 -07:00
Jordan Longstaff
35dcf93c51
Adult Ruto function and property names pulled in from decomp ( #4654 )
...
* Adult Ruto function and property names pulled in from decomp
* Align name changes more with decomp
* Nope, missed a couple more
2024-12-09 19:23:57 -07:00
Jordan Longstaff
6823b6990b
Name alpha-distance update function from decomp ( #4658 )
2024-12-09 19:23:14 -07:00
Pepper0ni
ad23298500
Automate settings text to enum conversion and remove OptionGroups from the process ( #4636 )
...
* Automate settings text to enum conversion
* rename fortress setting into carpenters
2024-12-09 19:18:00 -07:00
Archez
6470522a02
Fix temp flags transfering in dungeon chains and various issues with voidouts in mixed entrances ( #4637 )
2024-12-09 19:17:26 -07:00
Jordan Longstaff
de6f5d8b65
Skip Water Temple portcullis opening cutscene ( #4641 )
2024-12-09 09:14:47 -07:00
Jordan Longstaff
23dc4257a7
Skip one-point cutscene of Amy's blocks falling ( #4645 )
2024-12-09 09:14:01 -07:00
Jordan Longstaff
d0bfa6860b
Skip the Mweep cutscene ( #4646 )
...
* Skip the Mweep cutscene
* Fix bug: Ruto's letter was not removed from bottle
2024-12-09 09:13:45 -07:00
Jordan Longstaff
4010229de5
Rename bomb flower fuse setting field (decomp) ( #4653 )
2024-12-09 09:13:28 -07:00
Jordan Longstaff
2d37098379
Rename Sleeping Waterfall state machine function (decomp) ( #4655 )
2024-12-09 09:13:18 -07:00
Jordan Longstaff
d8d9119de9
Rename Kakariko Well water level function (decomp) ( #4656 )
2024-12-09 09:13:08 -07:00
briaguya
732b8c10f7
bump LUS ( #4638 )
...
* bump LUS
* bump OTRExporter
2024-12-08 11:46:31 -07:00
Archez
bccd96966f
Fix crash when toggling alt assets while paused ( #4621 )
2024-12-06 10:36:38 -05:00
Malkierian
09f297392f
Fix GetItemObtainabilityFromRandomizerGet check for sticks and nuts not accounting for not shuffling stick or nut bags and also not starting with related ammo. ( #4633 )
2024-12-05 21:35:27 -07:00
Archez
276db580e8
Fix display list offset values and unhandled opcodes ( #4618 )
...
* Fix display list offset values and unhandled opcodes
* fix unknown opcodes on custom chest textures
2024-12-05 11:00:39 -05:00
Pepper0ni
c3e4579cba
Change GetSelectedOptionText to contextSelection and clean up some junk ( #4613 )
...
* Change GetSelectedOptionText to contextSelection and clean up some junk
* more cleanup
* readd a fail alert as an assert
2024-12-04 11:01:25 -07:00
Archez
9b169af3f5
Fix find newline looping to have additional break early cases ( #4614 )
2024-12-04 11:01:08 -07:00
Pepper0ni
b442c15322
Skip Shadow Statue Cutscene ( #4612 )
...
* Skip Shadow Statue Cutscene
* cleanup
2024-12-03 12:30:14 -07:00
Pepper0ni
b1d1852655
Rewrite vanilla jabu logic ( #4603 )
...
* rewrite vanilla jabu logic
* cleanup
* more cleanup
2024-12-03 09:44:36 -07:00
Garrett Cox
291561667b
Update hook debugger to pull from GameInteractor ptrs rather than cloning the data every frame ( #4609 )
2024-12-03 09:44:18 -07:00
Caladius
82d70a2029
Add Timer Display Window ( #4553 )
...
* Add new timer window and display options
* Fix overflow spacing
* Icons for Timers
* Swap Labels for Icons.
* Additional Timers
* Navi Timer Icon
* Clean up unused Defines.
* Code clean up and double check. Ready for Review
* Update from Suggestions
* Update magic numbers, correct indentations hopefully
* One moooooore thing
* Undo z_param change
* Updates
2024-12-03 09:44:10 -07:00
Malkierian
8b60cea1f9
Split "Starting Consumables" to Sticks and Nuts. ( #4583 )
...
* Split "Starting Consumables" to Sticks and Nuts.
Setup disabling for them based on status of bag shuffles.
* Updated to split index options format.
2024-12-03 09:18:22 -07:00
Extloga
f2cc278f8c
Fixes for the English text in several files ( #4605 )
...
* Fixes for the English text in option_descriptions.cpp
* Fixes for the English text in static_data.cpp
* Fixes for the English text in option_descriptions.cpp
* Fixes for the English text in option_descriptions.cpp
* Fixes for the English text in settings.cpp
* Fixes for the German translation in hint_list.cpp
2024-12-03 09:18:07 -07:00
Pepper0ni
e704c5592b
fix text Poeverflow on Poes hint ( #4598 )
2024-12-03 09:11:01 -07:00
Garrett Cox
bbe3bb72b6
VBify Ruto ( #4602 )
2024-12-02 17:56:32 -07:00
Malkierian
4edb83e2f3
Fix errors introduced by actor check reveal PR from references to GetSelectedOptionIndex. ( #4607 )
2024-12-02 13:46:16 -07:00
Garrett Cox
fe9bf7d956
Adjust Actor_GetProjectileActor to behave more like hardware, fixing an issue with Dark Link ( #4606 )
2024-12-02 12:40:29 -07:00
Philip Dubé
caf0dc40c7
update check tracker when actor tells what they reward ( #4568 )
...
* update check tracker when actor tells you what they reward
do not render price when 0
* feedback
2024-12-02 09:04:21 -07:00
Eric Hoey
19d1fd5545
Boomerang Reticle and First-Person Aiming ( #3374 )
...
* First-person, reticle, sway, menu, and presets
* Put sway back behind reticle, adjust aim height for age
* block vanilla + comments
* new documentation method
* second try formatting
* Correct boomerang distance
* Update for CVAR changes
* Fix alignment?
* Condition cleanup
* Change reticle range to match bow behavior
* remove magic values
2024-12-02 09:03:47 -07:00
Jordan Longstaff
9b74a09955
Zora's River waterfall always open, take two ( #4459 )
...
* Zora's River waterfall always open, take two
* Remove improper, redundant checks in hook
* Move all checks into update hook
* Add Randomizer setting for keeping Sleeping Waterfall open
* Change header exports to extern exports
* Remove "closed as child" option for rando setting
* Oops, missed a spot
* A bit more cleanup: simplify a redundant condition
* Unify hook handlers
* Oopsie, fix build error
* Add "play only once" option
* Force Sleeping Waterfall enhancement in rando mode
* Force enhancement only if waterfall is Open in rando
* Restore forced-open waterfall in rando
* Fix rando condition in hook
* Fix? rando entrance logic for OI
* Fix build errors
2024-11-30 18:59:38 -07:00
Pepper0ni
ee628059d8
Fix Lab Man actor breaking and the invisible UI glitch ( #4599 )
...
* fix Lab Man actor breaking and the invisible UI glitch
* address review
2024-11-30 18:59:13 -07:00
Malkierian
573d846cd7
Add saved status setting to StartingItemGive ( #4600 )
2024-11-29 20:35:38 -07:00
Malkierian
55960da402
Separate option values into context and menu indexes. ( #4581 )
...
* 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`.
2024-11-29 17:58:30 -07:00
Malkierian
f7378a9f76
Cosmetics cleanup ( #4587 )
...
* Convert defaultColor from ImVec4 to Color_RGBA8.
Convert defaultColor's ints to floats when being applied to currentColor in the macro.
* Address previous cleanup comments.
Surround `Message` tab in an advanced check.
* Resolve warnings and cleanup whitespace/formatting.
* Make Color_RGBA8 constructing function because... platform differences...
* Function name clarification.
* Remove default color conversion, reference default colors directly in CosmeticOption initialization.
2024-11-29 11:38:40 -07:00
Pepe20129
a92c08dea1
Fix some situations where trade items spoiled ( #4569 )
...
* Fix some situations where trade items reverted
* Update z_game_over.c
* Hopefully fix mac
2024-11-27 10:33:50 -07:00
Pepper0ni
5b7b38f198
Add some +/- buttons and clean up timesavers menu ( #4571 )
...
* Add some +/- buttons and clean up timesavers menu
* Better implement Image Button Style
2024-11-26 18:29:27 -07:00
Malkierian
c960433832
Setup AdvancePond to run in OnItemReceive. ( #4585 )
2024-11-26 18:28:50 -07:00
Malkierian
13789a1dfb
Prevent void and teleport traps from being added to the shuffle pool while fishing in the pond. ( #4586 )
2024-11-26 18:28:24 -07:00
Pepe20129
7ccb3ac7c3
Cosmetics Changes ( #4275 )
...
* Clean CosmeticsEditor.h
* Add CosmeticsEditor_GetDefaultValue
* Add message text cosmetics
* Format cleanup
* Remove dependency on 3drando random functions
* Fix rainbow for every cosmetic
* Add "Rainbow All" & "Un-Rainbow All"
* Add HookshotChain cosmetic
* Add Nayru's cosmetics
* Add Farore's cosmetics
* Add Din's cosmetics
* Add Title card cosmetics
* Update CosmeticsEditor.cpp
* Add Copyright text cosmetic
2024-11-26 15:48:58 -07:00
Pepper0ni
d0f7d30c16
Fix OnePoint cutscenes, make Skip Glitch cutscenes into Exclude Glitch Cutscenes ( #4575 )
...
* Fix OnePoint chutscenes, make skip glitch cutscenes into exclude cutscenes
* address comments
2024-11-26 12:43:20 -07:00
Malkierian
31120b7188
Add master sword to ItemIDtoRandomizerGetMap to prevent assert crash in Return_Item after custom GIE was removed for MS. ( #4584 )
2024-11-25 20:36:35 -07:00
Archez
8926d8f784
Fix array out of bounds in entrance init ( #4566 )
2024-11-22 16:23:15 -07:00
Pepper0ni
5520c185bf
Limit retries of the randomiser quest menu seed generation ( #4564 )
2024-11-22 16:22:39 -07:00
Pepper0ni
9c99a1e515
Fix the "Greg as Reward" option in logic ( #4565 )
2024-11-22 16:22:27 -07:00
Pepper0ni
eda97653d6
Save timesplits colour to cvar and reload it on init. ( #4572 )
...
* save timesplits colour to cvar and reload it
* fix mac and match cosmetics with the color conversion
* more stupid other platform fixes
2024-11-22 10:28:10 -07:00
Pepper0ni
f0e5b9c22b
learning how to VB ( #4563 )
2024-11-19 18:46:44 -07:00
Philip Dubé
01719283b3
typo: incorrect variable assignment ( #4560 )
2024-11-19 16:29:15 -07:00
Pepper0ni
3e313bd063
Enhacment presets no longer reimport randomiser settings ( #4561 )
...
* Enhacment presets no longer reimport randomiser settings
* make the change only apply to the Randomiser button instead
2024-11-19 16:22:54 -07:00
Malkierian
3f2d8ddc01
Fix infinite freeze in rando on GS pickup. ( #4555 )
2024-11-19 15:40:23 -07:00
Malkierian
4850041943
Fix Gift from Sages not showing in tracker (it's a valid shuffle now!). ( #4556 )
...
Bit of tracker code cleanup.
2024-11-19 15:39:42 -07:00
Malkierian
5dd3b39a83
Fix Plando Window Crash on new installs ( #4557 )
...
* Add check for Randomizer folder existing, and creating it if not, to plando window.
* Changed seed list population to just bail if the Randomizer folder doesn't exist.
Added button disabling to prevent crashes loading or saving empty structures.
2024-11-19 15:39:30 -07:00
Pepe20129
9bed5af33b
OTRGlobals cleanup ( #4251 )
...
* 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>
2024-11-19 09:44:44 -07:00
Caladius
70f3dfa8c5
Built-in Plandomizer Editor ( #4532 )
...
* Add Plandomizer Editor Window
* UI, Ice Trap Editor, Hint Editor
* Drop down for previous seeds, wip hash display.
* Clean Up, Hash Icon Editor
* Updates based on suggestions
* Replace Tint with Color
* Add Boss Soul Icon
* Corrected App Folder Directory and updated from suggesstions.
* Add Hints to Junk Pool
* Utilize RandomElement for hints
* Hint update for pep
* apply patch
* Fix Sorting issue on Linux
* Skeleton Key, Shop Items, Milk, Fishing Pole, Ocarina Buttons, Loser Rupee fixed
* Fix stretched note icons.
* Remove Triforce, add Triforce Pieces. Centered Song Notes.
* Update soh/soh/Enhancements/randomizer/Plandomizer.cpp
Co-authored-by: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
* Update hint_list.cpp
One spelling, removed 1 hint.
* Update Plandomizer.cpp
---------
Co-authored-by: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Co-authored-by: Malkierian <malkierian@live.com>
2024-11-17 12:44:54 -07:00
Malkierian
53e2fe4974
Refine mixed pool options to be more dynamic. ( #4545 )
2024-11-13 08:49:10 -07:00
Malkierian
6230901f29
Fix duplicate use of CVar for invert shield aiming. ( #4544 )
2024-11-12 22:02:22 -07:00
Jordan Longstaff
1eff613aa6
Fix skipping twisted hallway cutscenes ( #4536 )
2024-11-12 13:09:08 -07:00
aMannus
c8e460cebe
Heal goron necks ( #4540 )
2024-11-12 12:58:41 -07:00
Garrett Cox
a6fbadc04e
Fix issues with vanilla item queue when skipping things, resolves #4537 ( #4538 )
2024-11-12 10:18:57 -06:00
Pepe20129
ffc132a01b
Clean __osMalloc.c ( #4351 )
...
* Remove #ifs
* Add `NODE_IS_VALID`
* Fix current macros
* `NODE_GET_NEXT` & `NODE_GET_PREV`
* Add macros
* Use macros and general cleanup
* Fix build (hopefully)
* Address review
2024-11-11 17:46:25 -07:00
Archez
f12a2bbbb7
Port over decomp updates for vis* and reimplement vismono fb ( #4533 )
...
* Port over decomp updates for vis*
* move vismono framebuffer handling to file
2024-11-09 12:51:31 -05:00
Pepper0ni
2603b97366
Rewrite MQ spirit logic ( #4534 )
...
* rewrite MQ spirit logic
* fix oversights
2024-11-09 09:40:00 -07:00
Pepe20129
c8815a26f7
Improve ganon tower logic ( #4526 )
...
* Improve ganon tower logic
* Fix build and address review
* Update locacc_ganons_castle.cpp
* Update locacc_ganons_castle.cpp
* Update locacc_ganons_castle.cpp
* Update logic.cpp
* Update randomizerTypes.h
---------
Co-authored-by: Malkierian <malkierian@gmail.com>
Co-authored-by: Malkierian <malkierian@live.com>
2024-11-09 09:34:05 -07:00
Jordan Longstaff
068cceff36
Update SFX symbols from decomp ( #4531 )
2024-11-08 20:36:57 -07:00
Archez
4eeb01905d
pull in decomp updates for z_play ( #4522 )
2024-11-07 09:52:21 -07:00
Pepper0ni
1d9d273a57
Rewrite MQ Water Temple Logic ( #4520 )
...
* Rewrite Storage Temple Logic
* fix a boss room oversight
* Fix some random errors
* cleanups
2024-11-07 09:51:29 -07:00
Garrett Cox
d07cbe8395
Adjustments to change age cheat and time travel enhancement ( #4512 )
2024-11-06 19:38:57 -07:00
Jordan Longstaff
a919b6a5a0
Fix skipping Adult Ruto one-point cutscene ( #4519 )
...
* Fix skipping Adult Ruto one-point cutscene
* Kill Ruto's actor instead of leaving her to swim up
* Change to Story cutscene
* Change to extern function
2024-11-06 19:38:44 -07:00
Archez
dabd0c25bd
Move collision viewer draw to hook and fix empty nametags ( #4523 )
2024-11-05 21:50:59 -05:00
Malkierian
894d3c00d3
Change ENTR_BOMBCHU_SHOP_0 to ENTR_BOMBCHU_SHOP_1 in entrance.cpp to fix interior shuffle crash. ( #4521 )
2024-11-04 20:16:27 -07:00
Archez
d8f8b6e6b9
Fix Bluewarp handling with entrance rando ( #4517 )
...
* force bluewarp skips on when entrance rando is enabled
* Fix second visits and other issues with lingering bluewarp state
2024-11-04 20:07:21 -07:00
Garrett Cox
20ac33d380
Fix #4506 , Mido crash in intro cutscene with Open Forest ( #4511 )
2024-11-02 10:50:48 -07:00
Pepper0ni
0d17e72dca
Rewrite MQ Shadow Temple logic ( #4502 )
2024-11-01 08:15:27 -07:00
Archez
ec1f03e8a2
Pass for some warning fixes ( #4501 )
2024-10-31 07:42:27 -07:00
Archez
98fa5663b4
Hookify more Entrance Rando handling ( #4500 )
...
* Hookify more entrance rando handling
* fix bad enums
2024-10-31 00:27:20 -04:00
Malkierian
6e024ed15d
Entrance Enum and Name Refactor ( #4484 )
...
* Rename entrance enums for clearer location by name.
Change entrance name strings to be clearer for single-entrance tracking.
* Rename grotto macros to remove "RANDO", and move them to `randomizerTypes.h` for use elsewhere.
* Add entrance enums to rando's entrance.cpp.
Rename a couple RandomizerRegions for consistency.
* Swap entrance ids to enum values in rando's entrance.cpp.
Few more renames for clarity and consistency.
* Adapt entrance tracker to utilize new names and only display original source and substituted destination.
Few more renames for consistency.
* Missed a space in the tracker output.
* Restore pre-digit names of some enums, name great fairies more consistently.
2024-10-30 19:44:34 -07:00
Jordan Longstaff
705bbea144
"Skip forced dialog" no longer skips optional Navi hints ( #4450 )
2024-10-30 19:14:22 -07:00
Archez
c232e13fff
Fix getItemEntry macros ( #4499 )
2024-10-30 16:15:39 -07:00
Pepper0ni
71e9e616b6
Rewrite MQ Jabu Logic ( #4493 )
...
* rewrite MQ Jabu Logic
* Add swim requirement to the rang jump trick as link hints the water first
2024-10-29 14:05:09 -07:00
Pepe20129
6bd3b1d160
Move & refactor Randomizer_Item_Give ( #4492 )
2024-10-29 09:24:56 -07:00
Pepper0ni
b706532754
Attempt to find area problems ( #4494 )
...
* Better insulate the code against no areas and fix misc issues
* remove a stray reminder comment
2024-10-28 17:35:36 -07:00
Malkierian
108d5061d4
Small Warnings Refactor ( #4477 )
...
* Disable all warnings, even in release, on the `src` directory.
Resolve math macro duplication warnings.
* Suppress LUS warnings.
* Modify it to utilize a variable that defaults on but can be specified in command line to disable it.
Prevet total compile option overwrite for LUS.
* Remove unnecessary unset and cache parameters.
* Document warnings flag in BUILDING.md
2024-10-28 17:30:11 -07:00
Malkierian
fd8e98ed12
Fix rando presets ( #4491 )
...
* Fix application of preset values to sliders.
* Add new rando CVars to preset list, and alphabetize.
2024-10-28 08:25:26 -07:00
Garrett Cox
2c08fca46c
Add faster rupee accumulator ( #4490 )
2024-10-28 08:25:15 -07:00
Malkierian
1df91890fe
Windows Build Assets Tweak ( #4486 )
...
* Change CMake process to copy assets necessary for OTR creation to VS run directory.
Remove reference to ExtractAssets target from Windows build instructions.
* Unify build instructions where appropriate across PC platforms.
Clarify commented parts of some commands.
* PR feedback.
2024-10-28 00:02:04 -07:00
Pepper0ni
d6ebed59dc
Fix oversight in Static Hints, add some asserts ( #4488 )
2024-10-27 22:24:14 -07:00
Malkierian
e5f4c091f8
Add condition to disabling Generate Randomizer button if file is loaded to prevent rando context confusion. ( #4487 )
2024-10-27 14:40:30 -07:00
Pepper0ni
438a8bff79
Rewrite MQ GTG and Ice Cavern logic ( #4483 )
...
* rewrite GTG logic
* Rewrite MQ Ice Cavern Logic
2024-10-27 14:16:51 -07:00
Malkierian
169e39ebad
Adds item names to filtered parameters. ( #4485 )
2024-10-27 09:02:51 -07:00
Garrett Cox
804584e79d
Fix rainbow bridge sound spam
2024-10-26 00:12:27 -05:00
Garrett Cox
20ddc7a536
Redo frog VB
2024-10-25 22:40:35 -05:00
Pepper0ni
7f4bd3e98c
Fix any dungeon location pool and fire boss door logic ( #4480 )
...
* fix any dungeon location pool and fire boss door logic
* Make GetDungeonLocations consistent
* add All to name
2024-10-25 17:51:50 -07:00
Pepper0ni
6ca55aadbd
Rewrite MQ Ganon's castle logic ( #4469 )
...
* rewrite ganon MQ logic
* typo fix
* remove excess brackets to avoid compiler errors
2024-10-25 17:51:07 -07:00
Pepe20129
a91243ec01
Fix msvc internal compiler errors on mq logic ( #4478 )
2024-10-25 20:19:01 +09:00
Malkierian
89fe9c1ccb
Fix Phantom Ganon fast death time saver crash. ( #4476 )
2024-10-24 21:55:17 -07:00
Pepper0ni
8638810b9d
Fix bean buy and warp song text crashes ( #4470 )
2024-10-23 17:34:44 -07:00
Malkierian
2ffd62a5b1
Fix scrubs behaving as if shuffled despite not being. ( #4468 )
...
Convert shop tracking to checking for shuffled.
Change "Hide right-side shop item checks" to "Hide unshuffled shop item checks" on the check tracker.
2024-10-23 08:35:25 -07:00
Caladius
75a0979bc7
Built-in Time Splits [v2.1] ( #4455 )
...
* Adds 2 new Hooks, OnTimeStamp and OnPlayerHealthChange.
* Re-add Timesplit code
* Committing custom Assets
* Commit Asset definitions
* Adding Windows
* Fix Modal Window and others
* Time Splits v2 new Hooks etc.
* Fixing Time Displays
* Adding Big Poe split
* Update Options Tab
* List Preview and Removing Split Entries
* Allow Split Table to resize
* Fix Window Color and Adding Non Items to Split List
* Correct Song Image Skew
2024-10-22 10:17:30 -07:00
Malkierian
8c304d54b2
Fix wallet display for More Info with non-rando saves. ( #4467 )
2024-10-22 10:10:50 -07:00
Malkierian
dee885622e
Add InjectItemCounts to the migrator. ( #4466 )
2024-10-22 09:46:50 -07:00
