[.85][UI] type of upgradeable weapon choice in Design screen

The current weapon choices are all based on (I think) greatest effect.  Which is fine in nearly every design, except where you want to create a unit that specifically will do a type of elemental damage.

There needs to be a upgradeable weapon by elemental type (melee and ranged version if needed).  Then I can create an ice mage, and they wiill get the better ice staff later when I research the tech.