added armor and shield to shipproperties