Changed combat to d20 instead