Combat mechanic update

After some play testing I discovered an issue with the combat mechanics, so I updated them a bit. With the previous rules, a character could become invincible over time. This update addresses that. Also, the rules are now much easier to understand.