mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-01-30 15:00:13 -05:00
Code Issues Projects Releases Wiki Activity

Fix vanilla

Browse Source
This commit is contained in:
Pepe20129 2025-01-29 16:45:52 +01:00
parent 48f1629988
commit e0d4a2ecd8
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
View File

@ -315,12 +315,28 @@ void KaleidoScope_HandleItemCycleExtras(PlayState* play, u8 slot, bool canCycle,
} }
} }
bool CanMaskSelect() {
if (IS_RANDO) {
return CVarGetInteger(CVAR_ENHANCEMENT("MaskSelect"), 0) /* || Randomizer_GetSettingValue(RSK_SHUFFLE_CHILD_TRADE) */;
}
// only allow mask select when:
// the shop is open:
// * zelda's letter check: Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER)
// * kak gate check: Flags_GetInfTable(INFTABLE_SHOWED_ZELDAS_LETTER_TO_GATE_GUARD)
// and the mask quest is complete: Flags_GetEventChkInf(EVENTCHKINF_PAID_BACK_BUNNY_HOOD_FEE)
return CVarGetInteger(CVAR_ENHANCEMENT("MaskSelect"), 0) &&
Flags_GetEventChkInf(EVENTCHKINF_PAID_BACK_BUNNY_HOOD_FEE) &&
Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER) &&
Flags_GetInfTable(INFTABLE_SHOWED_ZELDAS_LETTER_TO_GATE_GUARD);
}
void KaleidoScope_HandleItemCycles(PlayState* play) { void KaleidoScope_HandleItemCycles(PlayState* play) {
//handle the mask select //handle the mask select
KaleidoScope_HandleItemCycleExtras( KaleidoScope_HandleItemCycleExtras(
play, play,
SLOT_TRADE_CHILD, SLOT_TRADE_CHILD,
CVarGetInteger(CVAR_ENHANCEMENT("MaskSelect"), 0) /* || Randomizer_GetSettingValue(RSK_SHUFFLE_CHILD_TRADE) */, CanMaskSelect(),
IS_RANDO ? IS_RANDO ?
Randomizer_GetPrevChildTradeItem() : Randomizer_GetPrevChildTradeItem() :
( (
@ -374,7 +390,7 @@ void KaleidoScope_DrawItemCycles(PlayState* play) {
KaleidoScope_DrawItemCycleExtras( KaleidoScope_DrawItemCycleExtras(
play, play,
SLOT_TRADE_CHILD, SLOT_TRADE_CHILD,
CVarGetInteger(CVAR_ENHANCEMENT("MaskSelect"), 0) /* || Randomizer_GetSettingValue(RSK_SHUFFLE_CHILD_TRADE) */, CanMaskSelect(),
IS_RANDO ? IS_RANDO ?
Randomizer_GetPrevChildTradeItem() : Randomizer_GetPrevChildTradeItem() :
( (