mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-08-12 04:07:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix happy mask salesman to check flags instead of inventory for SOLD OUT (#6355)

Browse Source 
Fixes getting locked out of mask quest with mask select
This commit is contained in:
Philip Dubé
2026-03-17 17:41:04 +00:00
committed by GitHub
parent c906c71f71
commit 4e3b8d0b13
3 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
+2 -1
View File
@@ -2127,7 +2127,8 @@ u16 EnOssan_SetupHelloDialog(EnOssan* this) {
this->happyMaskShopState = OSSAN_HAPPY_STATE_NONE;
// mask shop messages
if (this->actor.params == OSSAN_TYPE_MASK) {
if (INV_CONTENT(ITEM_TRADE_CHILD) == ITEM_SOLD_OUT) {
if (GameInteractor_Should(VB_HAPPY_MASK_SHOP_CHECK_SOLD_OUT, INV_CONTENT(ITEM_TRADE_CHILD) == ITEM_SOLD_OUT,
this)) {
if (Flags_GetItemGetInf(ITEMGETINF_3B)) {
if (!Flags_GetEventChkInf(EVENTCHKINF_PAID_BACK_BUNNY_HOOD_FEE)) {
// Pay back Bunny Hood