New combat system!

Once I finish the little improvements I will make a change log. No time
to do so as of this commit