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

Shuffle Masks (#5536)

Browse Source 
Future improvements can build on this,
giving masks abilities,
or adding checks for trading mask to someone
This commit is contained in:
Philip Dubé
2026-01-17 05:00:03 +00:00
committed by GitHub
parent 69f151e79d
commit 44d351698b
18 changed files with 225 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/code/z_parameter.c
+1 -1
View File
@@ -2120,7 +2120,7 @@ u8 Item_Give(PlayState* play, u8 item) {
}
}
}
// update the adult/child equips when rando'd (accounting for equp swapped hookshot as child)
// update the adult/child equips when rando'd (accounting for equip swapped hookshot as child)
if (IS_RANDO && LINK_IS_CHILD) {
for (i = 1; i < ARRAY_COUNT(gSaveContext.adultEquips.buttonItems); i++) {
if (gSaveContext.adultEquips.buttonItems[i] == ITEM_HOOKSHOT) {
soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
+3 -3
View File
@@ -324,9 +324,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); /* || Randomizer_GetSettingValue(RSK_SHUFFLE_CHILD_TRADE) */
return (CVarGetInteger(CVAR_ENHANCEMENT("MaskSelect"), 0) && Flags_GetRandomizerInf(RAND_INF_ZELDAS_LETTER) &&
Flags_GetInfTable(INFTABLE_SHOWED_ZELDAS_LETTER_TO_GATE_GUARD)) ||
Randomizer_GetSettingValue(RSK_MASK_QUEST) == RO_MASK_QUEST_SHUFFLE;
}
// only allow mask select when: