1598 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Garrett Cox	b2f4d5e95a	Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity	2022-09-06 13:30:49 -05:00
Garrett Cox	0683b30bf2	Merge pull request #4 from leggettc18/pr/garrettjoecox/1329 ... Shopsanity Improvements/Bugfixes	2022-09-06 09:06:48 -05:00
Christopher Leggett	acaf4e6bcc	Fixes sold out items not getting overwritten by the randomized info.	2022-09-06 02:42:55 -04:00
briaguya	8d75603e4b	Merge pull request #1425 from garrettjoecox/1471-fix-shooting-gallery-rando-check ... Fix #1417	2022-09-06 01:30:37 -04:00
Christopher Leggett	4d9bf936b1	Fixes order of operations so Rupees will be spent.	2022-09-06 01:12:11 -04:00
briaguya	d2682998c4	Merge pull request #1423 from garrettjoecox/fix-for-scrubs-being-disabled ... Fix issue when merchantPrices is empty	2022-09-06 01:05:16 -04:00
Christopher Leggett	5d38b23850	Implements items selling out and fixes issues with purchasing some items.	2022-09-06 00:58:36 -04:00
Garrett Cox	a99330a8a5	Fix #1417	2022-09-05 23:34:52 -05:00
Garrett Cox	c9c648322d	Fix for a single zeroed merchantPrice entry	2022-09-05 22:30:39 -05:00
Garrett Cox	0ab4f21382	Fix issue when merchantPrices is empty	2022-09-05 22:14:39 -05:00
Christopher Leggett	c0b3f229fa	Adds slotIndex to girla (shop item actor) and uses that for IdentifyShopItem.	2022-09-05 20:39:52 -04:00
briaguya	885d6dc6c2	Merge pull request #1422 from garrettjoecox/scrubs-trials-persist ... Add merchantPrices to save file instead of loading from active spoiler log	2022-09-05 19:41:58 -04:00
briaguya	803ef49f6d	Merge pull request #1416 from aMannus/rando-skip-mask-shop-fix ... Rando: Fix Complete Mask Quest & Mask Select interaction bugs	2022-09-05 19:27:00 -04:00
briaguya	bafd016cd9	Merge pull request #1413 from aMannus/rando-key-colors-default ... Rando: Enable key colors matching dungeon by default	2022-09-05 19:09:37 -04:00
Garrett Cox	670a41bd08	Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity	2022-09-05 15:33:15 -05:00
Garrett Cox	96a3354d45	Remove trialsRequired persisting in save manager	2022-09-05 15:12:30 -05:00
Garrett Cox	1c13fdec5f	Add trials required and merchant prices to save file instead of loading from active spoiler log	2022-09-05 14:55:34 -05:00
aMannus	fb5aff393a	tooltip line break	2022-09-05 16:54:02 +02:00
aMannus	9afe3ca746	Fix gerudo keys, add disabled checkbox	2022-09-05 16:48:59 +02:00
aMannus	39852c9278	Fix Sold Out bug	2022-09-05 11:46:50 +02:00
aMannus	983ab139d5	Add another flag to skip mask shop	2022-09-05 00:35:56 +02:00
briaguya	87a78cf87c	Merge pull request #1405 from PurpleHato/TrackerAmmoFix ... Rando: Item Tracker currentAndMax rework	2022-09-04 18:35:46 -04:00
aMannus	fe413fd675	Set key colors to be on by default	2022-09-04 23:09:17 +02:00
Garrett Cox	45fc416963	Swap german and french translations for shop messages	2022-09-04 15:25:37 -05:00
Garrett Cox	ad1e051b59	Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity	2022-09-04 15:23:18 -05:00
PurpleHato	a6937e9850	added hovertext for the number display	2022-09-04 21:31:50 +02:00
Garrett Cox	adb7ce773e	Merge pull request #3 from leggettc18/pr/garrettjoecox/1329 ... Implement's Tycoon Wallet.	2022-09-04 14:30:47 -05:00
Garrett Cox	f282e25c16	Move all merchant messages to be generated on file load	2022-09-04 13:53:59 -05:00
PurpleHato	47c7d3f061	always display XX/YY when in ammo/capacity mode	2022-09-04 20:39:56 +02:00
PurpleHato	e11ca62ee1	small tweaks and rename	2022-09-04 20:09:48 +02:00
PurpleHato	2c241d5fe8	Merge branch 'rando-next' into TrackerAmmoFix	2022-09-04 19:57:56 +02:00
PurpleHato	7a222f9d0f	Merge pull request #20 from garrettjoecox/item-tracker-count-adjustments ... Refactor DrawItemCount and Use EnhancementCombobox for tracker capacity options	2022-09-04 19:39:01 +02:00
Garrett Cox	6bf886ecae	Refactor DrawItemCount and Use EnhancementCombobox for tracker capacity options	2022-09-04 11:55:40 -05:00
Christopher Leggett	9e617f8923	Implement's Tycoon Wallet.	2022-09-04 12:32:07 -04:00
briaguya	2c63321638	Merge pull request #1407 from garrettjoecox/item-tracker-notes-fix ... Ensure itemTrackerNotes vector is not fully empty in InitItemTracker	2022-09-04 07:47:01 -04:00
Garrett Cox	1bbde39439	Ensure itemTrackerNotes vector is not fully empty	2022-09-04 02:06:42 -05:00
briaguya	6439c45f26	Merge pull request #1402 from garrettjoecox/beans-obtainability-fix ... Fix for beans obtainability	2022-09-03 20:04:11 -04:00
PurpleHato	6dbc292ff3	Fix: changes to please new LUS	2022-09-04 01:22:15 +02:00
PurpleHato	ed96a0c272	Merge branch 'rando-next' into TrackerAmmoFix	2022-09-04 01:08:26 +02:00
PurpleHato	27f613b3f8	All color logic for all types	2022-09-04 01:03:28 +02:00
briaguya	e55ec29d66	Merge pull request #1396 from garrettjoecox/item-tracker-notes ... Persist item tracker notes	2022-09-03 18:40:32 -04:00
Garrett Cox	8a3d1352d7	Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into shopsanity	2022-09-03 17:39:11 -05:00
PurpleHato	d4bc5875d7	tweak on main logic	2022-09-03 23:49:15 +02:00
Garrett Cox	77a5d03019	Hook into file delete and clear notes	2022-09-03 15:46:33 -05:00
Garrett Cox	72660e2cfd	Fix for beans obtainability	2022-09-03 15:28:59 -05:00
PurpleHato	377c030469	Fixed capacity on ammmo tracking	2022-09-03 21:57:58 +02:00
briaguya	d90145da47	Merge pull request #1391 from aMannus/rando-skip-scarecrow ... Rando: Add Skip Scarecrow's Song option	2022-09-03 15:04:58 -04:00
briaguya	8e49f0465c	Merge pull request #1399 from aMannus/rando-bombchu-drops ... Rando: Add Bombchu Drops	2022-09-03 15:03:30 -04:00
aMannus	6cd8d6ca3a	Clean up bool	2022-09-03 20:48:00 +02:00
aMannus	8d033c6766	Update settings.cpp	2022-09-03 20:29:45 +02:00