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

Enforce mask select properly on completed (#6326)

Browse Source
This commit is contained in:
Pepper0ni
2026-03-05 22:07:06 +00:00
committed by GitHub
parent 92a1d260da
commit 6deff6d749
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
+5 -2
View File
@@ -322,7 +322,9 @@ void KaleidoScope_HandleItemCycleExtras(PlayState* play, u8 slot, bool canCycle,
bool CanMaskSelect() {
if (IS_RANDO) {
return (CVarGetInteger(CVAR_ENHANCEMENT("MaskSelect"), 0) && Flags_GetRandomizerInf(RAND_INF_ZELDAS_LETTER) &&
return ((CVarGetInteger(CVAR_ENHANCEMENT("MaskSelect"), 0) ||
Randomizer_GetSettingValue(RSK_MASK_QUEST) != RO_MASK_QUEST_VANILLA) &&
Flags_GetRandomizerInf(RAND_INF_ZELDAS_LETTER) &&
Flags_GetInfTable(INFTABLE_SHOWED_ZELDAS_LETTER_TO_GATE_GUARD)) ||
Randomizer_GetSettingValue(RSK_MASK_QUEST) == RO_MASK_QUEST_SHUFFLE;
}
@@ -332,7 +334,8 @@ bool CanMaskSelect() {
// * 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) &&
return (CVarGetInteger(CVAR_ENHANCEMENT("MaskSelect"), 0) ||
Randomizer_GetSettingValue(RSK_MASK_QUEST) != RO_MASK_QUEST_VANILLA) &&
Flags_GetEventChkInf(EVENTCHKINF_PAID_BACK_BUNNY_HOOD_FEE) &&
Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER) &&
Flags_GetInfTable(INFTABLE_SHOWED_ZELDAS_LETTER_TO_GATE_GUARD);