Armour weight counting

Armour weight is added to the total.

After all items have been added, a second round of armour adding is
done.