1139 Commits

Author	SHA1	Message	Date
aMannus	c10693d281	Merge branch 'rando-next' into rando-settings-menu-even-moar-changes	2022-08-31 10:02:13 +02:00
Sarge-117	55fa913c78	Couple more ... Just need German for these Co-Authored-By: PurpleHato <47987542+PurpleHato@users.noreply.github.com>	2022-08-30 15:24:44 -07:00
Sarge-117	d9ad01174b	Merge remote-tracking branch 'upstream/rando-next' into update-navi-hints-rando	2022-08-30 14:22:11 -07:00
Sarge-117	b803c77f58	Add French translation ... Thanks to PurpleHato	2022-08-30 14:22:02 -07: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
Sarge-117	f4e53c54b5	Correct German spellings, add 2 more hints	2022-08-29 18:17:23 -07: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	c7207d2e0a	Move obtainability check up higher	2022-08-29 17:42:48 -05:00
Garrett Cox	8c6774fa35	More small changes	2022-08-29 16:00:47 -05:00
Garrett Cox	ded7ccab3f	Minor fixes	2022-08-29 15:35:37 -05:00
Garrett Cox	5961c33ba9	Rename GetItemFromGet and move obtainability checks to a separate function	2022-08-29 15:26:27 -05:00
aMannus	1161873044	Moar names	2022-08-29 21:51:42 +02:00
Christopher Leggett	51dbee365a	Oops part 2	2022-08-29 01:04:13 -04:00
Christopher Leggett	f44c588a2c	Oops	2022-08-29 01:03:21 -04:00
Christopher Leggett	a84262dbf7	Bit of cleanup	2022-08-29 00:11:10 -04:00
Christopher Leggett	0a27714b8e	Adds missing case for RSK_GERUDO_KEYS from spoilerfile parsing.	2022-08-29 00:09:44 -04:00
Christopher Leggett	35d651f06e	When shuffled to Own Dungeon or below, give vanilla keys, maps, and compasses.	2022-08-28 23:54:13 -04:00
Christopher Leggett	760eaa4d97	Adds randotodo comment as a note to adapt for the keysanity situation.	2022-08-28 23:14:42 -04:00
Christopher Leggett	0de1cd96b1	Fixes keys, maps, and compasses on develop-zhora rando.	2022-08-28 23:14:29 -04:00
aMannus	fdc0aa9ab4	Code Cleanup	2022-08-28 21:07:18 +02:00
aMannus	2456473f49	Merge fix	2022-08-28 20:21:32 +02:00
aMannus	1c59995feb	Merge branch 'rando-next' into rando-settings-menu-even-moar-changes	2022-08-28 20:19:19 +02:00
aMannus	77f4472902	Redone layout tabs/columns	2022-08-28 19:40:46 +02: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	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
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	637f089485	some stuff	2022-08-27 00:42:54 +02:00
aMannus	83abf57766	Add skull token to links pocket	2022-08-26 23:51:36 +02:00
aMannus	4ebcc83161	Code styling	2022-08-26 15:13:34 +02:00
aMannus	9e6d61d7ec	Incompatible checkboxes	2022-08-26 11:13:11 +02:00
aMannus	b43f77caba	Columns in childs & code style changes	2022-08-26 09:56:34 +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
lilDavid	ad33aba9ba	Merge branch 'rando-next' into bombchu-logic	2022-08-25 11:23:30 -05: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
Christopher Leggett	90067be132	Fixes Dungeon Rewards from Song from Impa (#1311)	2022-08-25 17:19:17 +02:00
aMannus	9787f9d4f2	Swap hints & item pool	2022-08-25 16:34:48 +02:00
Christopher Leggett	5842beeb55	Fixes Bean Pack item from chest.	2022-08-25 10:11:35 -04:00
Christopher Leggett	ef1b662bf4	Finishes wiring up bean salesman settings and text.	2022-08-25 09:42:15 -04:00
briaguya	4ca146b4e1	Merge pull request #1299 from aMannus/bgs-dupe-fix ... Rando: Fix BGS dupe check	2022-08-25 07:49:10 -04:00
aMannus	7de2c584b4	Rando menu tweaks	2022-08-25 11:11:24 +02:00
aMannus	c41de36c46	Comment	2022-08-25 10:36:28 +02:00
aMannus	6fd22f50ab	Swapped logic to boss key	2022-08-25 10:35:04 +02:00
aMannus	954a96baeb	tha fix	2022-08-25 10:27:04 +02:00
aMannus	bc5ec24889	Ice trap fix	2022-08-25 09:54:08 +02:00
aMannus	2626f6c7e3	Fixed Winner PoH on skulltula's	2022-08-25 09:34:46 +02:00
aMannus	cc6e4238cf	Fixes BGS on skull tokens	2022-08-25 08:49:15 +02:00
aMannus	050a9db01d	Fix BGS dupe check	2022-08-25 08:38:42 +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	db6a397195	Adds new text for the bean salesman	2022-08-24 17:58:01 -04:00
Christopher Leggett	c4de29b7f1	Correctly sets BEANS_BOUGHT as a "flag" for the bean salesman	2022-08-24 17:24:50 -04:00
Christopher Leggett	adf465c1a0	Sets up Magic Bean Salesman to sell a rando check for 60 rupees.	2022-08-24 17:20:45 -04:00
briaguya	f15b3880f3	Merge pull request #1292 from aMannus/custom-key-colors-fix ... Rando: Custom key colors fix	2022-08-24 17:17:54 -04:00
briaguya	1d77b7fd24	Merge pull request #1293 from aMannus/rando-lost-woods-target-crash-fix ... Rando: Lost Woods target crash fix	2022-08-24 17:16:15 -04:00