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
Pepper0ni
a005075bd2
Fix Settings Loading Issues ( #4465 )
2024-10-22 08:50:05 -07:00
Pepper0ni
dd9253808b
Rewrite forest MQ logic, add swim to lake logic ( #4464 )
...
* rewrite forest logic, add swim to lake logic
* fix small oops
* oops
2024-10-21 19:18:50 -07:00
Jordan Longstaff
3a4bd1164a
Add freeze timer hook for Gold Skulltula collection ( #4445 )
...
* Add freeze timer hook for Gold Skulltula collection
* Remove unused player references
* Replace magic number text IDs
* Separate hook for freezing player on token collection
* Revert one unintended change
2024-10-21 19:18:34 -07:00
Malkierian
17d8487730
Modify all (4) instances of Flags_GetRandomizerInf() returns that were u8 to s32 to avoid value overflow. ( #4463 )
2024-10-21 14:55:46 -07:00
Garrett Cox
92c791b7c0
Add simple notifications system
2024-10-21 13:20:33 +00:00
Malkierian
4663bd152a
VBify poe collector giving for rando. ( #4458 )
...
* VBify poe collector giving for rando.
* Forgot an include.
* Further refinement so all the action happens in the handler. Virtual full restoration of vanilla code flow.
* Restored 1000 point messages before rando item give.
* Cleanup redundant GI Should call.
2024-10-20 23:49:32 -07:00
Jordan Longstaff
b2e99b8ff5
Zora's River waterfall opens instantly ( #4454 )
...
* Zora's River waterfall opens instantly
* VB cleanup
* Move it all to VB hook
* Fix build errors
* Null safety
2024-10-20 23:36:47 -07:00
Garrett Cox
df6763257b
Refactor network usage and adapt Sail/CC to changes
2024-10-21 01:30:32 +00:00
Garrett Cox
29d7c54250
Move CrowdControl/Sail files
2024-10-21 01:30:32 +00:00
Malkierian
6d1d57d19a
Restores check color functionality. ( #4451 )
2024-10-20 01:03:47 -07:00
Pepper0ni
323c67b47c
Change CanUse to include an assert, fix some bad uses of CanUse ( #4444 )
2024-10-20 01:03:09 -07:00
Pepper0ni
81db6e3996
refix loach check ( #4448 )
2024-10-20 01:00:54 -07:00
Jordan Longstaff
c644f9f4be
Restore plus/minus buttons on King Zora slider ( #4449 )
2024-10-20 01:00:46 -07:00
Pepper0ni
ba38d985b3
Rewrite MQ fire logic and fix MQ deku logic ( #4443 )
...
* commit to merge
* rewrite fire and fix deku
2024-10-20 01:00:39 -07:00
Garrett Cox
cbd35d0ef5
Tweaks to cmake globbing/source_grouping ( #4439 )
2024-10-18 09:35:07 -07:00
Malkierian
a7cb7da9fc
Change SoH Input Editor CVar to CVAR_WINDOW and remove definition for LUS's input editor CVar from the cmake. ( #4438 )
2024-10-17 22:06:43 -07:00
Malkierian
7e78abf01c
Restore tooltip to skip text, add tooltips to slow text speed and match text speed. ( #4437 )
2024-10-17 22:03:13 -07:00
Archez
f1841a20f3
add gfx debugger support ( #4345 )
...
Co-authored-by: Malkierian <malkierian@gmail.com>
2024-10-17 19:05:31 -07:00
Patrick12115
ed32a2820c
Ageless Item Fixes ( #3908 )
...
* Fixes Mirror Shield and MS sheath
* Added Hookshot Tip&Chain and more edge cases
* Update presets.h
* Revert "Update presets.h"
This reverts commit 95d952ba23
2024-10-17 18:42:14 -07:00
Malkierian
5a23da4ce0
Make ConfigUpdaterV2 use CVarClearBlock instead of manually scanning. ( #4435 )
2024-10-17 18:41:38 -07:00
Malkierian
dba74f8805
Disable Lens Effect On Unequip ( #4432 )
...
* Add logic to turn off lens effect when replacing it on a button with another item, but not swapping.
* Swap to real fix for dpad equips bug, c/o Rozelette.
2024-10-17 14:36:53 -07:00
Pepe20129
b5c6545d6f
z_player documentation 2024-10-11 (#4407 )
...
* Add names to start of typedefs
* Idle stuff
* 2 functions
* Player state flags
* Name functions + misc
* ActionChange => ActionHandler
* Some player unks
* More player unks
* Header misc
* Misc
* More misc
* Player Actions
* Missed comments
* Move ship specific stuff
* Fix build
* CsCmdActorAction to CsCmdActorCue
* Fix build
2024-10-17 11:55:31 -07:00
Malkierian
3c5d9faba3
Blair Config Migrator V3 ( #4148 )
...
* Config migrator to handle CVar macros/sections, as well as a few other changes since MacReady.
* One more round of cleanup.
* Move config migrators above SetupGuiElements to allow for migrated window variables to register before windows use them to determine visibility.
* One more.
* Adapt DpadEquips, NavOnL, and PauseAnyCursor CVars to accommodate Pablo moving them to enhancements.
2024-10-16 21:58:31 -07:00
Malkierian
b7bbb1bb8a
Make starting_inventory.cpp add the Master Sword based on RSK_STARTING_MASTER_SWORD. ( #4431 )
2024-10-16 21:54:55 -07:00
Malkierian
469797478e
Force global rando context's Logic child to release its parent Context reference. ( #4429 )
2024-10-16 20:52:36 -07:00
Jordan Longstaff
52d1a98f41
Add "All" button for item count messages ( #4430 )
2024-10-16 20:52:23 -07:00
Jordan Longstaff
c1295f33fe
Unify "No forced dialog" settings in combo box ( #4425 )
...
* Unify "No forced dialog" settings in combo box
* Rename options
2024-10-16 19:45:51 -07:00
Malkierian
e178df3e0c
Change SkipIntro to check any entrance shuffle rather than just overworld spawns. ( #4428 )
2024-10-16 16:39:35 -07:00
Malkierian
262ec4817b
Re-sync deku stick cheat CVar name. ( #4427 )
2024-10-16 15:54:55 -07:00
Jordan Longstaff
b3ce27efed
Add separate speed option for slower text ( #4424 )
2024-10-16 15:32:56 -07:00
Jordan Longstaff
dcd26b2de8
Segregate count-injected item get messages by type ( #4422 )
...
* Segregate count-injected item get messages by type
* Move item count messages submenu up next to Items submenu
* Rectify presets
* Oops - deleted a comma by mistake
2024-10-16 14:18:24 -07:00
Pepper0ni
43b04a32cd
rewrite MQ deku tree logic ( #4418 )
2024-10-16 14:16:58 -07:00
Jordan Longstaff
da79e5e015
Fix fast speed skipping quick text markers ( #4416 )
2024-10-15 20:50:10 -07:00
Malkierian
45af1028af
Fix options and sliders to prevent index out of range issues. ( #4421 )
2024-10-15 17:59:20 -07:00
Jordan Longstaff
960c9c4fd1
Fix heart piece injection messages to cover all counts ( #4417 )
2024-10-15 17:03:36 -07:00
