Add more robust PvP modes

It’s basically a fighting game anyway