Gotta reiterate punishment for those cursed dice! What madness are they suffering from?

I love the Griefkeeper, so I'm very excited to see them show back up.

As for the resupply, I actually agree with you that it doesn't make a lot of sense to remove unprepared with resupply. But it's also your game, so homebrew it to be removable via a strong hit (make a weak hit not do it if you want to maintain a level of difficulty).