combat system v2.1 + fixes