Will fix armour types going to right places

Any armour type can be added to any armour position, will find a way to determine what kind of armour it is and put it in the right place.
Added 'todo' to make sure it's done!