proficiencies are now included in combat calculations