Updated rest of the code to use more generic veterancy and damage type checks