mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-06-03 10:41:11 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,491 Commits 6 Branches 52 Tags
e53ec33d85c458c45d2114bc3ab4c5ff8a7264b8
Commit Graph

674 Commits

Author SHA1 Message Date
Garrett Cox 25ed66439e Fix repeatable purchases and bottles rendering incorrectly 2022-09-02 17:23:37 -05:00
Garrett Cox d1dac2a2ee Add obtainability checks correctly 2022-09-02 15:22:09 -05:00
Garrett Cox 0277db578f Merge branch 'GetItem-renaming' of github.com:garrettjoecox/OOT into shopsanity 2022-09-02 14:33:32 -05:00
Garrett Cox 42858bf15e Add shopsanity condition around shop changes 2022-09-02 13:27:59 -05:00
Garrett Cox 7a22763e55 Fix an issue with textId and with giving items with fanfare 2022-09-02 12:39:08 -05:00
Garrett Cox d60a82d67a Use randomizerInf 2022-09-02 11:47:57 -05:00
Garrett Cox 43d8a11de5 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity 2022-09-02 11:07:21 -05: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 26c41079bd Merge pull request #1362 from lilDavid/rando_biggoron_fix 
Randomizer: Fix Biggoron checks
 2022-09-01 12:50:37 -04:00
briaguya 5a009590fc Merge remote-tracking branch 'origin/develop-zhora' into ztorn 2022-09-01 12:06:25 -04:00
lil David c84654b202 Always check n64ddFlag before bgsFlag 
that order is consistent with the existing condition in EnGo2_GetStateGoronDmtBiggoron
 2022-09-01 09:23:08 -05:00
lil David 0a744cde01 Clarify comments 2022-09-01 08:11:17 -05:00
lil David ea9db56914 Merge remote-tracking branch 'upstream/rando-next' into bombchu-logic 2022-09-01 07:59:09 -05:00
lilDavid cfaed3ded0 Make Biggoron ignore whether you have BGS in rando 2022-08-31 22:07:34 -05: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
briaguya 32c36eb5c4 Merge pull request #1355 from leggettc18/rando-next-chest-fixes 
Randomizer: Fixes a few bugs related to chests.
 2022-08-31 16:15:46 -04:00
Christopher Leggett 042d6f3865 Fixes a few bugs related to chests. 2022-08-31 10:57:59 -04:00
Christopher Leggett 776219fb52 Backports a fix for sheik checks from rando-next (#1340) 
* Fixes some Sheik checks I had accidentally set the wrong flag for.

* Removes duplicate switch case from cherry-pick
 2022-08-31 15:25:47 +02: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
briaguya 6d4288c2a5 Merge pull request #1331 from leggettc18/ganon-trials 
Reimplements selecting different amounts of Ganon's Trials.
 2022-08-28 11:48:34 -04:00
Christopher Leggett fafd90482b Refactor of some old rando code to use new functions. 2022-08-27 18:42:36 -04:00
Christopher Leggett 404a637ebd Removes added function that went unused. 2022-08-27 15:56:11 -04:00
Christopher Leggett 3d8b8066da More comment cleanup 2022-08-27 14:33:38 -04:00
Christopher Leggett 1bf8423f75 Reimplements selecting different amounts of Ganon's Trials. 2022-08-27 14:19:37 -04:00
Christopher Leggett 928a39fe9e More Cleanup 2022-08-27 09:30:49 -04:00
Christopher Leggett a572c11f4f Fixes ice trap gidata not getting cleared after trap is sprung. (#1322) 2022-08-27 09:27:20 +02:00
Christopher Leggett bf1b327a95 Cleanup and Documentation 2022-08-27 02:50:44 -04:00
Christopher Leggett 7fbb381db7 Changes Malon's behavior to so she won't leave Hyrule Castle until you've obtained her item. 2022-08-27 02:25:13 -04:00
Garrett Cox 67a890ed1e Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity 2022-08-26 21:41:21 -05: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 29b9f0b37e Comment 2022-08-25 19:58:05 +02:00
aMannus 49b48fb7a4 Fix BGS and maps/keys textboxes 2022-08-25 19:56:34 +02:00