Yes, there are units with multiple weapons. The problems with units that have spears and swords still happen, but we have decided that some will use multiple weapons.