243 Commits

Author	SHA1	Message	Date
Garrett Cox	d60a82d67a	Use randomizerInf	2022-09-02 11:47:57 -05:00
Garrett Cox	73606edf4e	Use merchantMessageTableID	2022-09-02 11:08:48 -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	32ea5ef564	Use randomizerMerchantPrices	2022-09-02 11:04:45 -05:00
Christopher Leggett	812a1e7970	Added return statement in IsVanillaItem before keys.	2022-09-01 17:50:12 -04:00
briaguya	f391505b0e	Merge pull request #1344 from aMannus/more-random-rupee-names ... Rando: German and more English random rupee names	2022-09-01 15:18:29 -04:00
aMannus	1e13879c6b	Removed name	2022-09-01 19:43:08 +02:00
briaguya	a55eb572db	fix keysanity related build issue	2022-09-01 12:06:41 -04:00
briaguya	5a009590fc	Merge remote-tracking branch 'origin/develop-zhora' into ztorn	2022-09-01 12:06:25 -04:00
lil David	ea9db56914	Merge remote-tracking branch 'upstream/rando-next' into bombchu-logic	2022-09-01 07:59:09 -05:00
aMannus	354905fb7d	Added 1 more name	2022-09-01 11:06:05 +02:00
Christopher Leggett	bf505dba5c	Fixes keys, maps, and compasses on develop-zhora rando (#1338) ... * Fixes keys, maps, and compasses on develop-zhora rando. * Adds randotodo comment as a note to adapt for the keysanity situation.	2022-08-31 15:25:58 +02: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
Christopher Leggett	9c43f7225b	Adds captilization to French spoilerfile strings.	2022-08-27 18:45:21 -04:00
Christopher Leggett	6aaef2179b	More Cleanup	2022-08-27 18:26:25 -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	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
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	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	71e7fb9d70	Merge rando-next and rename scrub message table to merchant message table	2022-08-25 18:02:00 -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
Christopher Leggett	5043309c63	Adds basic german text for bean salesman	2022-08-25 16:43:57 -04: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
Garrett Cox	936513a9c4	Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into scrubsanity	2022-08-25 13:02:47 -05:00
Christopher Leggett	efd4ceb636	Colors keywords in bean salesman text.	2022-08-25 12:46:08 -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	ed5a2d8a42	Merge pull request #1307 from aMannus/rando-menu-tweaks ... Rando: Small menu tweaks	2022-08-25 11:57:03 -04: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
aMannus	7de2c584b4	Rando menu tweaks	2022-08-25 11:11:24 +02:00
aMannus	050a9db01d	Fix BGS dupe check	2022-08-25 08:38:42 +02:00
Christopher Leggett	db6a397195	Adds new text for the bean salesman	2022-08-24 17:58:01 -04:00
Christopher Leggett	fe7aedc80d	Adds getItemEntry for Magic Bean Pack	2022-08-24 15:44:31 -04:00
Christopher Leggett	02a8ba8bb9	Fixes incorrect key order in DrawSmallKeys.	2022-08-24 13:16:14 -04:00
Christopher Leggett	ecd0e3e8bb	Merge branch 'rando-next' of github.com:HarbourMasters/Shipwright into color-coded-keys	2022-08-24 13:03:44 -04:00
Garrett Cox	b7e3a72f85	Fix issue from bad merge and a few other small things	2022-08-24 11:00:02 -05:00
Garrett Cox	693dc479d2	Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into scrubsanity	2022-08-24 10:22:57 -05:00