Commit Graph

1053 Commits

Author SHA1 Message Date
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
9c43f7225b
Adds captilization to French spoilerfile strings. 2022-08-27 18:45:21 -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
6aaef2179b
More Cleanup 2022-08-27 18:26:25 -04:00
Christopher Leggett
404a637ebd
Removes added function that went unused. 2022-08-27 15:56:11 -04:00
Christopher Leggett
dbd8909d26
Forgot to limit slider from 1-6 rather than 0-6 2022-08-27 15:53:57 -04:00
Christopher Leggett
4d8bfa97c0
UI Changes (dropdown and slider rather than checkbox and slider) 2022-08-27 15:51:14 -04:00
Christopher Leggett
3d8b8066da
More comment cleanup 2022-08-27 14:33:38 -04:00
Christopher Leggett
ff0ef4a6b4
ImGui/Commented out code cleanup. 2022-08-27 14:27:02 -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
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
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
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
71e7fb9d70
Merge rando-next and rename scrub message table to merchant message table 2022-08-25 18:02:00 -04:00
Christopher Leggett
e9fa231ae6
Merge branch 'rando-next' of github.com:HarbourMasters/Shipwright into magic-bean-pack 2022-08-25 17:45:41 -04:00
briaguya
0107699a6b more formatting 2022-08-25 17:29:09 -04:00
briaguya
866cb3166b formatting 2022-08-25 17:28:46 -04:00
briaguya
0bcc5b1310 no more blank spoilers 2022-08-25 17:27:37 -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
Christopher Leggett
5043309c63
Adds basic german text for bean salesman 2022-08-25 16:43:57 -04:00
Garrett Cox
dc9eeb18d9 Increase size of randomizerInf 2022-08-25 15:38:41 -05:00
briaguya
4919bddda2 Merge branch 'develop-zhora' into ztorn 2022-08-25 16:08:16 -04:00
Garrett Cox
c76ff719f4 Fix issue in spoiler generation 2022-08-25 13:53:04 -05:00
Garrett Cox
1e31d108e6 Various changes from feedback, and use new randomizerInf table 2022-08-25 13:49:02 -05:00
Christopher Leggett
3da197f0cd
Removes some magic numbers 2022-08-25 14:39:12 -04: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
aMannus
9fda6a0764 Merge branch 'rando-next' into tokensanity-bgs-fix 2022-08-25 19:27:55 +02:00
Christopher Leggett
efd4ceb636
Colors keywords in bean salesman text. 2022-08-25 12:46:08 -04:00
Christopher Leggett
6ab13f389b
Fixes salesman to properly take 60 rupees from you. 2022-08-25 12:43:19 -04:00
Christopher Leggett
00838cb5b6
Adds french text for the bean salesman 2022-08-25 12:39:34 -04:00
briaguya
9f60a97307
Merge pull request #1303 from aMannus/rando-skulls-winnerpoh-fix
Rando: Fix Winner PoH on skulltula's
2022-08-25 12:23:29 -04:00
briaguya
8a4c196566
Merge pull request #1312 from garrettjoecox/randomizer-inf
Transition to randomizerInf flags
2022-08-25 12:19:55 -04:00
aMannus
c22951353e Renamed function 2022-08-25 18:04:52 +02:00
briaguya
ed5a2d8a42
Merge pull request #1307 from aMannus/rando-menu-tweaks
Rando: Small menu tweaks
2022-08-25 11:57:03 -04: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