Adding support for two weapons plus armour.