github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-13 01:57:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

No longer grey out bracelet as adult when toggle option is on and strength enabled

Browse source
This commit is contained in:
inspectredc 2023-10-18 21:29:00 +01:00
commit c22d1e724d
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c
View file

@ -700,7 +700,7 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
point = CUR_UPG_VALUE(sChildUpgrades[i]); point = CUR_UPG_VALUE(sChildUpgrades[i]);
if ((point != 0) && (CUR_UPG_VALUE(sChildUpgrades[i]) != 0)) { if ((point != 0) && (CUR_UPG_VALUE(sChildUpgrades[i]) != 0)) {
// Grey Out the Gauntlets as Child // Grey Out the Gauntlets as Child
// Grey Out Strength Upgrades when Disabled and the Toggle Option is on // Grey Out Strength Upgrades when Disabled and the Toggle Strength Option is on
if ((drawGreyItems && if ((drawGreyItems &&
((sChildUpgradeItemBases[i] + CUR_UPG_VALUE(sChildUpgrades[i]) - 1) == ITEM_GAUNTLETS_SILVER || ((sChildUpgradeItemBases[i] + CUR_UPG_VALUE(sChildUpgrades[i]) - 1) == ITEM_GAUNTLETS_SILVER ||
(sChildUpgradeItemBases[i] + CUR_UPG_VALUE(sChildUpgrades[i]) - 1) == ITEM_GAUNTLETS_GOLD)) || (sChildUpgradeItemBases[i] + CUR_UPG_VALUE(sChildUpgrades[i]) - 1) == ITEM_GAUNTLETS_GOLD)) ||
@ -720,11 +720,11 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
KaleidoScope_DrawQuadTextureRGBA32(play->state.gfxCtx, gItemIcons[sChildUpgradeItemBases[i] + CUR_UPG_VALUE(sChildUpgrades[i]) - 1], 32, 32, 0); KaleidoScope_DrawQuadTextureRGBA32(play->state.gfxCtx, gItemIcons[sChildUpgradeItemBases[i] + CUR_UPG_VALUE(sChildUpgrades[i]) - 1], 32, 32, 0);
gSPGrayscale(POLY_KAL_DISP++, false); gSPGrayscale(POLY_KAL_DISP++, false);
} else if (CUR_UPG_VALUE(sAdultUpgrades[i]) != 0) { } else if (CUR_UPG_VALUE(sAdultUpgrades[i]) != 0) {
// Grey Out the Goron Bracelet when Not Randomized // Grey Out the Goron Bracelet when Not Randomized and Toggle Strength Option is off
// Grey Out Strength Upgrades when Disabled and the Toggle Option is on // Grey Out Strength Upgrades when Disabled and the Toggle Strength Option is on
if ((drawGreyItems && if ((drawGreyItems &&
(((sAdultUpgradeItemBases[i] + CUR_UPG_VALUE(sAdultUpgrades[i]) - 1) == ITEM_BRACELET && (((sAdultUpgradeItemBases[i] + CUR_UPG_VALUE(sAdultUpgrades[i]) - 1) == ITEM_BRACELET &&
!(IS_RANDO)))) || !(IS_RANDO) && !CVarGetInteger("gToggleStrength", 0)))) ||
(CVarGetInteger("gToggleStrength", 0) && CVarGetInteger("gStrengthDisabled", 0) && sAdultUpgrades[i] == UPG_STRENGTH)) { (CVarGetInteger("gToggleStrength", 0) && CVarGetInteger("gStrengthDisabled", 0) && sAdultUpgrades[i] == UPG_STRENGTH)) {
gDPSetGrayscaleColor(POLY_KAL_DISP++, 109, 109, 109, 255); gDPSetGrayscaleColor(POLY_KAL_DISP++, 109, 109, 109, 255);
gSPGrayscale(POLY_KAL_DISP++, true); gSPGrayscale(POLY_KAL_DISP++, true);