The 3.5E rules are okay, but I tried to avoid the +1 per round thing, which, while it seems like a good way to model the situation, isn't very 5Eish.
Savage Worlds gives you a +2 on your vigor check if you have a water soaked mask or some other device which is equivalent to an advantage in 5E.