Commit Graph

388 Commits

Author SHA1 Message Date
briaguya 8e49f0465c
Merge pull request #1399 from aMannus/rando-bombchu-drops
Rando: Add Bombchu Drops
2022-09-03 15:03:30 -04:00
aMannus 274242e0d7 Implement rando bombchu drops 2022-09-03 20:17:12 +02:00
Christopher Leggett e079c254f1
Fixes Link starting with BGS 2022-09-03 09:39:03 -04:00
briaguya 3a6d7fcfd0 and make it build 2022-09-03 04:23:25 -04:00
briaguya 975a854054 Merge branch 'develop-zhora' into z-to-rando-next 2022-09-03 03:47:09 -04:00
Christopher Leggett 350d0b91ed
Removes unneeded `GiveLinkItem` functions. 2022-09-03 02:47:42 -04:00
Christopher Leggett 36cc9d562c
Adds more options for Link's starting item. 2022-09-03 02:34:21 -04:00
briaguya 6daf357fd9
fix include fix build (#1385)
Co-authored-by: briaguya <briaguya@alice>
2022-09-03 02:13:20 -04:00
Christopher Leggett 2015e3a041
Converts Song from Impa to use `Item_Give` 2022-09-03 01:48:07 -04:00
Christopher Leggett a5804ca2b2
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.
2022-09-03 01:22:33 -04:00
louist103 8118947ab0
Windows crash handler. (#1383)
* Windows crash handler.

* Fix naming convention.
2022-09-03 01:15:43 -04:00
David Chavez 0ce0ab1260
Phase 1: Separate ImGui Drawing From LUS (#1310)
* Update LUS imported paths

* Introduce GameMenuBar

* Fix imports after LUS import paths change

* Move Randomizer

* Replace needs_save

* Migrate Developer Tools

* Migrate Cheats

* Migrate Enhancements

* Separate UIWidgets

* Add missing Hooks.cpp file

* Migrate Settings

* Remove UI methods from LUS

* Cleanup imports and exposed properties

* Cleanup more methods

* Fix project generation

* Fix CI compilation

* Remove resolved TODO
2022-09-03 00:00:04 -04:00
Christopher Leggett 64aca78450
Fixes Switch/Wii U crashes with Wonder Rupees and Bottleable Entities (#1360)
* 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
2022-09-02 19:19:12 +02:00
Garrett Cox ee2f38ad91 Renaming of some randomizer item/check/get methods 2022-09-02 10:34:20 -05:00
Garrett Cox c7a7059db4 Minor adjustments from feedback and rename CanObtain to ItemObtainability 2022-09-02 09:38:41 -05:00
Garrett Cox 676f8945ab Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into GetItemFromGet-changes 2022-09-02 09:15:31 -05:00
briaguya 5a009590fc Merge remote-tracking branch 'origin/develop-zhora' into ztorn 2022-09-01 12:06:25 -04:00
louist103 584a4ad818
Linux crash handler (#1209)
* crash handler linux

* cleanups

* missing underscore

* more cleanups

* cleanups

* 32 bit
2022-08-31 22:59:38 -04:00
Christopher Leggett 60257b98a4
Oops. Missed closing bracket. 2022-08-30 11:21:29 -04:00
Christopher Leggett 3856d1b0a7
Fixed small key case that was behind an else and shouldn't have been 2022-08-30 11:00:47 -04:00
Christopher Leggett 99674ff88c
Readds missing workaround for spirit temple and ganon's castle keys. 2022-08-29 19:19:01 -04:00
Garrett Cox 5961c33ba9 Rename GetItemFromGet and move obtainability checks to a separate function 2022-08-29 15:26:27 -05:00
Christopher Leggett 404a637ebd
Removes added function that went unused. 2022-08-27 15:56:11 -04:00
Christopher Leggett 1bf8423f75
Reimplements selecting different amounts of Ganon's Trials. 2022-08-27 14:19:37 -04:00
Christopher Leggett 62aeac51b9
ACTUALLY fixes adult trade items on save init this time. 2022-08-26 22:14:49 -04:00
Christopher Leggett 9f47099232
Properly handles starting link with adult trade items. 2022-08-26 21:17:12 -04:00
Christopher Leggett 05136c13b7
Fixes Link getting Song as pocket item (#1326) 2022-08-27 02:46:19 +02:00
aMannus 83abf57766 Add skull token to links pocket 2022-08-26 23:51:36 +02:00
Christopher Leggett 53531c4481
Cleanup 2022-08-26 01:17:51 -04:00
Christopher Leggett 9148fa5aec
Adds custom particles to Freestanding Bean Pack item. 2022-08-25 20:48:28 -04:00
Christopher Leggett 4a51ab3187
Fixes bug where Bean Pack was also granting blue potion 2022-08-25 20:42:34 -04:00
Christopher Leggett 78e506a072
Merge branch 'rando-next' of github.com:HarbourMasters/Shipwright into magic-bean-pack 2022-08-25 16:58:05 -04:00
briaguya da07a8f409
Merge pull request #1300 from aMannus/tokensanity-bgs-fix
Rando: Tokensanity BGS and maps/compasses fix
2022-08-25 16:50:21 -04:00
briaguya 1cfa0a9623
Merge pull request #1264 from garrettjoecox/scrubsanity
Scrubsanity
2022-08-25 16:48:28 -04:00
briaguya 4919bddda2 Merge branch 'develop-zhora' into ztorn 2022-08-25 16:08:16 -04:00
Garrett Cox 1e31d108e6 Various changes from feedback, and use new randomizerInf table 2022-08-25 13:49:02 -05:00
Christopher Leggett c2fed1a382
Fixes Lost Woods Bridge Ice Trap in Rando (#1313) 2022-08-25 20:16:43 +02:00
Garrett Cox 936513a9c4 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into scrubsanity 2022-08-25 13:02:47 -05:00
aMannus 9fda6a0764 Merge branch 'rando-next' into tokensanity-bgs-fix 2022-08-25 19:27:55 +02:00
aMannus 69157640f6 Removed BGS flag in Item_Give() 2022-08-25 17:34:45 +02:00
Garrett Cox 5e9d1d61f1 Fix minor thing in sram 2022-08-25 10:34:39 -05:00
Garrett Cox f7bd48aaca Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into randomizer-inf 2022-08-25 10:27:34 -05:00
Garrett Cox 95372718a3 Transition a few things to randomizerInf flags 2022-08-25 10:27:31 -05:00
Christopher Leggett 90067be132
Fixes Dungeon Rewards from Song from Impa (#1311) 2022-08-25 17:19:17 +02:00
aMannus cc6e4238cf Fixes BGS on skull tokens 2022-08-25 08:49:15 +02:00
briaguya d2fe83edf4
Merge pull request #1295 from HarbourMasters/develop-zhora
quick zhora -> rando-next
2022-08-24 19:47:26 -04:00
Baoulettes c0b9171f98
Cosmetics Editor Fixes (#1287) 2022-08-25 01:28:27 +02:00
Christopher Leggett c4de29b7f1
Correctly sets `BEANS_BOUGHT` as a "flag" for the bean salesman 2022-08-24 17:24:50 -04:00
aMannus 179c432ee1 Comment 2022-08-24 22:20:20 +02:00
aMannus d5074c3e77 Fixes double def and split second wrong colors 2022-08-24 22:18:24 +02:00