-
Notifications
You must be signed in to change notification settings - Fork 481
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Unify Shops, Scrubs and Merchants price and hinting code #4321
base: develop-rando
Are you sure you want to change the base?
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can't really comment on the hint part of this PR but there's some other stuff that could be improved.
if (!GameInteractor_Should(VB_GIVE_ITEM_FROM_CARPET_SALESMAN, false, this)) { | ||
if (GameInteractor_Should(VB_GIVE_BOMBCHUS_FROM_CARPET_SALESMAN, true, this) || Actor_HasParent(&this->actor, play)){ | ||
Rupees_ChangeBy(-200); | ||
En_Js_SetupAction(this, func_80A89160); | ||
} else{ | ||
Message_ContinueTextbox(play, 0x6073); | ||
func_80A89008(this); | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is fairly confusing, what is this change for?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In order to avoid a 2 part knot of logic where Bombchu Bag and Merchant Shuffle are both trying to affect the same vanilla function, I made it so that if the merchant is selling a randomised check, it completely skips the vanilla handling and processes the sale entirely in the hook. This also made handling the flag and post-sale custom text (Now I can get back to being an arms dealer) timing conflict much easier as I could swap the text IDs without making another hook and another flag for that hook.
soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp
Show resolved
Hide resolved
Co-authored-by: Pepe20129 <[email protected]>
Note to self, Don't code tired. *proceeds to ignore note* Co-authored-by: Angelo Bulfone <[email protected]>
This removes HINT_TEXT_MERCHANT (something I wanted to do before upstream) and fixes a bunch of related issues at the same time as massively expanding the price options for all 3 types of check.
New Features
Bugfixes
Cleanups
Build Artifacts