UC_UNLOCKPERCENT: Make SECRET_COLOR option actually count Spray Cans, not unlockables directly

This commit is contained in:
toaster 2023-10-14 22:36:41 +01:00
parent 70c0b0503d
commit e4a3b85adf

View file

@ -1349,6 +1349,12 @@ boolean M_CheckCondition(condition_t *cn, player_t *player)
unlocked++; unlocked++;
} }
} }
// Special case for SECRET_COLOR
else if (cn->extrainfo1 == SECRET_COLOR)
{
total = gamedata->numspraycans;
unlocked = gamedata->gotspraycans;
}
// Special case for raw Challenge count // Special case for raw Challenge count
else if (cn->extrainfo1 == SECRET_NONE) else if (cn->extrainfo1 == SECRET_NONE)
{ {
@ -2017,8 +2023,8 @@ static const char *M_GetConditionString(condition_t *cn)
checkavailable = true; checkavailable = true;
break; break;
case SECRET_COLOR: case SECRET_COLOR:
work = "of Spray Cans"; work = (gamedata->gotspraycans == 0) ? "of ???" : "of Spray Cans";
checkavailable = true; //checkavailable = true;
break; break;
default: default:
return va("INVALID CHALLENGE FOR PERCENT \"%d\"", cn->requirement); return va("INVALID CHALLENGE FOR PERCENT \"%d\"", cn->requirement);