add armor types and move calculation into spreadsheet