Replace orientation with getter / setter
Use updated isValidArmor