Angelo Bulfone
081a55ab29
Fix accidental assignment expression ( #4248 )
...
A typo from a5c0cede12
2024-07-19 23:49:26 -04:00
Pepper0ni
4df4e61eb3
Fix return of Item_Give for stricter compilers ( #4244 )
...
* fix return of Item_Give for stricter compilers
* change to just item
2024-07-18 14:42:48 -07:00
Pepe20129
8b6c183776
Rando: Skeleton key ( #3997 )
...
* Initial Implementation
* Add temporary model to the skeleton key
2024-07-17 09:55:05 -07:00
Pepper0ni
7595a5a65e
fix selection only and make MQ dungeon settings set themselves more smartley ( #4232 )
2024-07-17 09:45:29 -07:00
Pepe20129
a5c0cede12
Rando: Shuffle consumable bags ( #3959 )
...
* Main implementation
* Fix sticks & nuts from shops & checks
* Change the models to normal stick & nut
Worth noting that before you have the bags, the refills are blue rupees so there will not be model collision
* Update hook_handlers.cpp
2024-07-17 09:42:56 -07:00
Pepe20129
f2958aea1c
Improved rando settings ( #3980 )
...
* Initial implementation
* center icons (#5 )
---------
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
2024-07-16 20:25:28 -07:00
Pepe20129
8eb6304999
Rando: Keyring tristate ( #3960 )
...
* Initial implementation
* Fix build
* Update UIWidgets.cpp
* Update option.cpp
* Update settings.cpp
* Update settings.cpp
* Apply Pepper0ni's patch
Co-Authored-By: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
* Update option_descriptions.cpp
---------
Co-authored-by: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
2024-07-16 20:25:06 -07:00
Angelo Bulfone
2ff795e227
Fix MQ Checks ( #4234 )
2024-07-16 16:39:18 -04:00
Christopher Leggett
ba82bfbba6
Fix spawn shuffle when starting age is adult/random. ( #4230 )
...
* Fix spawn shuffle when starting age is adult.
* Handle adult start without spawn shuffle
* Handle correct entrance for adult start + spawn shuffle and add comments.
* Fix grotto spawn cutscene skips.
* Fix an issue with randomized starting age.
2024-07-13 16:51:54 -04:00
Pepper0ni
a0fda39a75
Force Warp Song Hints off when Warp Songs are not shuffled ( #4229 )
2024-07-11 10:38:52 -04:00
Pepper0ni
77770ba3b2
fix hint crash on windows ( #4227 )
2024-07-09 18:57:28 -04:00
Christopher Leggett
7a17fe221f
Don't play the intro cutscene on child spawn even if location is shuffled ( #4226 )
...
* Don't play the intro cutscene on child spawn even if location is shuffled.
* Fix condition to not always skip cutscene when IS_RANDO is true.
* Fix typo
2024-07-07 21:22:23 -04:00
Pepe20129
8b001da317
Check tracker show logic ( #3972 )
...
* Initial Implementation
* Fix missing locations
* Update locacc_castle_town.cpp
---------
Co-authored-by: Christopher Leggett <chris@leggett.dev>
2024-07-05 21:13:49 -04:00
Pepper0ni
f88883044e
Add OoT Static Hint, Fix Sheik Crashes, Add multiple text boxes to AutoFormat ( #4149 )
...
* add OoT hint, sheik is crashing without hint due to an unrelated bug
* Fix Sheik crashes, add new textbox to autoFormat, trim OoTHint text
* save pls
* fix receive typos
* git pls
* nice conflict fix
2024-07-05 20:16:56 -04:00
Pepper0ni
1ca8d0ab73
Implement Mask Hints ( #4152 )
...
* Implement Mask Hints
* fix typo
2024-07-05 17:52:59 -04:00
Pepper0ni
5c155a625a
Quick fix Chest Minigame Setting ( #4189 )
2024-07-05 17:50:58 -04:00
Pepper0ni
db5e9cbc11
Fix Multiple Foolish hints from an area being generated. ( #4190 )
...
* Fix Multiple Foolish hints for the same location
* remove debug comment
2024-07-05 17:49:56 -04:00
Pepper0ni
510b655e5e
Fix Link's Pocket Appearing in Hints. ( #4191 )
...
* Fix issues with areas not being applied to the region itself, and Link's Pocket Propogating through randomised warps
* Address reviews
* address reviews again
* fix mac issues
* git pls
2024-07-05 17:35:47 -04:00
Garrett Cox
baf7691fbd
Fix weirdness with item gets from chests ( #4146 )
2024-05-13 12:29:34 -05:00
Garrett Cox
6f7173a5c4
Split a few VB changes out into their own files ( #4123 )
2024-05-09 22:22:08 -05:00
Pepe20129
118cd044b5
Rando: Starting hearts ( #3974 )
...
* Initial implementation
* Re-run build
---------
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-05-09 21:39:22 -05:00
Garrett Cox
24e1d45e95
Merge pull request #4130 from Malkierian/dev-to-rando-5-6
...
develop->dev-rando 5-7
2024-05-09 20:13:34 -05:00
Malkierian
1d5a54901b
Add MSI to EnEx hook handler.
...
Resolve other review suggestions.
2024-05-09 09:45:13 -07:00
Pepper0ni
ca803099cf
Fix DistributeHints ( #4145 )
...
* fix stupid crash in DistributeHints
* replace some uint8s in loops with size
2024-05-09 07:22:39 -05:00
Malkierian
baf41161d3
Merge branch 'develop' of github.com:Malkierian/Shipwright into dev-to-rando-5-6
2024-05-08 22:28:29 -07:00
Archez
47b690fb1e
Bump LUS and restore guMtx in collision viewer ( #4137 )
2024-05-09 01:26:58 -04:00
Malkierian
f550bf1381
Merge branch 'develop' of github.com:Malkierian/Shipwright into dev-to-rando-5-6
2024-05-08 21:36:25 -07:00
Malkierian
3bcf178fcc
Fix LUS ref.
2024-05-08 20:24:44 -07:00
Lywx
1231b8f9fa
Fixed macos/ios errors ( #4138 )
2024-05-08 19:30:22 -04:00
briaguya
22c9d53985
bump lus (gfx debugger fix, stormlib optimizations) ( #4135 )
2024-05-08 11:23:43 -04:00
Kenix3
3c87c1ec98
Lus window bump ( #4131 )
2024-05-08 02:25:50 -04:00
briaguya
0976198f2c
get soh working with latest lus ( #4132 )
2024-05-08 00:13:47 -04:00
Malkierian
ee1f15523c
Merge branch 'develop-rando' of github.com:Malkierian/Shipwright into dev-to-rando-5-6
2024-05-07 14:37:00 -07:00
Malkierian
cfd93f160d
Fix check tracker performance changes.
...
Move Mysterious Shuffle functionality to `hook_handlers.cpp` when applicable.
2024-05-07 13:07:33 -07:00
Pepper0ni
980b1f1a6e
Fix an infinite loop in hints and better comment hint distribution ( #4080 )
2024-05-07 12:48:00 -05:00
Pepe20129
8e520e490c
Spoiler name removal ( #3814 )
...
* Initial pass
* Rename "MK" to "Market"
* Remove more spoiler names
* Update location_list.cpp
* Replace vector with array
* Update location_list.cpp
* Re-run build
* Fix spacing
2024-05-07 08:29:17 -05:00
briaguya
52fad95a2c
support lus thread_pool changes ( #4127 )
2024-05-06 22:08:11 -04:00
Malkierian
d10b68516c
Merge branch 'develop' of github.com:Malkierian/Shipwright into dev-to-rando-5-6
2024-05-06 18:37:56 -07:00
Malkierian
8d3902a256
Remove unnecessary and redundant checks and references. ( #4111 )
...
Stop passing checksByArea to functions in the same namespace.
Only get value of `HideFilteredAreas` once per frame.
Gate area and check evaluations behind checks being visible and search filter size greater than 0.
Proper function capitalization.
2024-05-06 19:27:35 -05:00
Malkierian
b3d51441eb
Rando Enhancement: Mysterious Shuffled Items ( #3227 )
...
* Add rando enhancement "Mysterious Shuffled Items", which obfuscates shuffled freestanding/drawn-in-world items (PoH, tokens, shop items) with a custom question mark model (thanks Hato), and uses the "mysterious item" functionality of `GetMerchantMessage` for everything that supports it, regardless of hint status on generation.
* Reverted back to rando enhancement, but added condition for Mysterious Shuffle not being on for the gem rotation fix to apply.
* First attempt at changing to fake GetItemEntry instead of directly calling the mystery draw function. Needs more work.
* Updated CVar to reflect CVar rework values.
Added `IsCheckShuffled` as preliminary function for checking *only* if a check is shuffled, not necessarily if it is just visible on the tracker. This accounts for the difference between tokensanity and "Always Show GS On Tracker", where you don't want to obfuscate the latter.
* Bit of cleanup.
* Cross-platform building edits. If anyone has a better idea of how to handle this fake GIE, I'm all ears.
* Update to CVar macros.
* Fix freestanding item gives.
Fix mysterious item model colors.
* Fix bombchu bowling mystery.
* Remove bowling bomchus check obfuscation (unused, removed in v3).
2024-05-06 19:17:08 -05:00
Lywx
f3b948226b
Bump lus and fixed PatchGfx ( #4125 )
...
* Bump lus and fixed PatchGfx
* Bump libultraship to main
2024-05-06 19:19:15 -04:00
Malkierian
438dede792
Change "AnubixFix" back to "AnubisFix". ( #4124 )
2024-05-06 17:10:06 -05:00
Eric Hoey
27dd303a57
Limit crawl speed to modifier to 4 ( #4113 )
2024-05-06 19:10:22 +00:00
Pepper0ni
d0627dc737
fix a V2 compatibility crash ( #4119 )
...
* Attempt to fix ambiguity issues and a V2 compatibility crash
* oops
* remove explicit call as it is fixed elsewhere
2024-05-06 19:10:00 +00:00
Garrett Cox
a96fe678f8
Merge pull request #4118 from Malkierian/dev-to-rando-5-5
...
develop -> develop-rando 5-5
2024-05-06 14:09:41 -05:00
Archez
a860a7ea39
Merge pull request #4122 from Archez/merge-macready-may6
...
Merge macready -> develop
2024-05-06 14:51:24 -04:00
Malkierian
89f119c566
Fix ambiguity.
2024-05-06 11:13:30 -07:00
Adam Bird
439574d0d9
Merge remote-tracking branch 'origin/develop' into merge-macready-may6
2024-05-06 12:22:48 -04:00
Malkierian
f354460d04
Make it build.
2024-05-05 22:43:11 -07:00
Malkierian
69eebf0984
CVar cleanup.
2024-05-05 22:27:33 -07:00
