Warlocks suffer again. This is why I think 4e's style of giving each class the same number of resources that recharge on short/long rests is better. Making a short rest magic user just because isn't necessarily good game design. I've literally never played in a campaign that does 6 encounters per adventuring day because combat takes so fucking long and we don't want to stretch a single adventuring day over 6 real life weeks. (Gritty Realism does not solve this. Do not suggest it. It changes narrative pacing. Not getting resources back for a month and a half still sucks.)