National Units and

Here is something I want to bring up: using more of the <ForceObsoleteTech> tag on non-Culture National Units to prevent old ones from appearing on the build lists. I'm sure everyone has observed this: when Unit X upgrades to Unit Y, you no longer see Unit X on your build list as long as you can build Unit Y. If you can no longer build Unit Y, then Unit X reappears. For example, if you are in the Renaissance Era and build your three allowed Warlord Corporals, the Warlord Captain reappears on your build list unless you have both of your allowed Captains in play.

In the case of Hunter units, the <ForceObsoleteTech> tag prevents you from building an obsolete hunter. For example, Tracker has <ForceObsoleteTech>TECH_HUNTING_TACTICS</ForceObsoleteTech>, so when you gain the ability to train Hunters and train your allowed 5, the ForceObsoleteTech tag prevents you from training Trackers. I think we should also be doing this with the following types of units:

• Criminal Units
• Trade Units
• Trade Ship Units
• Vassal Units
• Warlord Units

In some places, we have a <ForceObsoleteTech> already in place, but I think it should be moved to an earlier technology. Most of the Trade units don't force-obsolete until Motorized Transportation, and I think they should be obsoleting earlier than that.

These are the units that I think this should apply to:

Unit	Obsoleting Tech	Current Obsoleting Tech
Thief	Personal Adornment	Matchlock
Rogue	Code of Laws	Matchlock
Assassin	Matchlock	Matchlock
Sharpshooter	Military Science
Sniper	Laser
Modern Sniper	Superstrong Alloys
Early Merchant	Trade	Motorized Transportation
Trade Caravan	Engineering	Motorized Transportation
Supply Train	Motorized Transportation
Cog Merchant	Optics
Carrack Merchant	Chemistry
Clipper Merchant	Submarine Warfare
Liberty Merchant	Coast Guard
Warlord Chief	Heraldry
Warlord Captain	Leadership
Warlord Corporal	Military Science
Warlord Colonel	Logistics

The Vassal units (Noble, Lord, Warlord Vassal, and Viceroy) also seem a little confusing to me, in that they feel like they should be one merged line, instead of two separate lines (Noble - Lord, Warlord Vassal - Viceroy). It seems disconnected to me that even though they are all National Unit - 1 Allowed, you can have a Lord and a Viceroy in play at the same time. This is the current setup:

Unit	Req Tech	Upgrades to	+XP Given	Current Obsoleting Tech
Noble	Aristocracy	Lord	10	Chivalry
Warlord Vassal	Vassalage	Viceroy	15	Leadership
Lord	Chivalry	-	15
Viceroy	Leadership	-	20

I think it should look more like this:

Unit	Req Tech	Upgrades to	+XP Given	Obsoleting Tech
Noble	Aristocracy	Warlord Vassal	6	Vassalage
Warlord Vassal	Vassalage	Lord	10	Chivalry
Lord	Chivalry	Viceroy	15	Leadership
Viceroy	Leadership	-	20

What do you think?