I think a second combat armory and weaponsmith is just silly. Why not make the current ones upgradeable instead of taking up more island space. Maybe give us a "plan" like for the rarity provisions house that would double production speed permanently.
