Fix: Granny empty bottle check#3068
Conversation
|
Are we certain the logic expects you to find the claim check before getting Granny's item with Merchant Shuffle? That restriction feels a little weird to me. |
|
If I'm reading the logic right, all that's required when adult trade is shuffled is the OddMushroom: |
Yes this is how it was coded in the logic when it was introduced. It's to replicate the fact that the check is not available until after the odd mushroom is turned in. So in the case of trade shuffle off, having the claim check means you've "already turned in" the odd mushroom from the logic perspective (having a trade item implies you had the previous, etc) This is how it was made in 3d rando and N64 rando. |
When Merchant shuffle is on, and Adult Trade shuffle is off, if you have not found the claim check yet the rando item trade offer should be skipped, and the Blue potion refill flow happens instead. The bug was that the "can buy" logic was missing a check for claim check, which meant that Granny was offering a blue potion refill, but the empty bottle check was skipped.
This PR abstracts the "can buy rando" item logic into a method and re-uses that in all the relevant places to avoid any inconsistent logic.
The tooltip for shuffle merchants is also updated to call out the behavior when shuffle adult trade is on/off.
Build Artifacts