Add escort missions for building improvements

AI now has the ability to create escort missions for Great Generals,
Archaeologists and regular Workers. Previously they could only do it for
Settlers, Great Merchants and diplomat units. Future consideration for
Great Prophets or perhaps all missionary units.

AI will now escort Great Generals when they are building citadels. As
well as when they are moving between cities.

AI can now escort Archaeologists and Workers when they are building
outside of friendly territory.

AI can now escort workers moving between different non-contiguous parts
of their empire.

Consolidate archaeology logic into the regular worker logic.

Author: KungCheops

(1) Community Patch/Database Changes/Units/CoreNewUnitFormations.xml

@@ -13,6 +13,18 @@
 			<Type>MUFORMATION_CARRIER_ESCORT</Type>
 			<Name>Carrier Strike Group</Name>
 		</Row>
+		<Row>
+			<Type>MUFORMATION_BUILDER_ESCORT</Type>
+			<Name>Worker Escort</Name>
+		</Row>
+		<Row>
+			<Type>MUFORMATION_ARCHAEOLOGIST_ESCORT</Type>
+			<Name>Archaeologist Escort</Name>
+		</Row>
+		<Row>
+			<Type>MUFORMATION_GENERAL_ESCORT</Type>
+			<Name>Great General Escort</Name>
+		</Row>
 	</MultiUnitFormations>
 	<!-- Delete everything and reinsert -->
 	<MultiUnitFormation_SlotEntries>
@@ -1061,5 +1073,48 @@
 			<SecondaryUnitType>UNITAI_ADMIRAL</SecondaryUnitType>
 			<MultiUnitPositionType>MUPOSITION_CIVILIAN_SUPPORT</MultiUnitPositionType>
 		</Row>
+		<!-- Builder Escort -->
+		<Row>
+			<MultiUnitFormationType>MUFORMATION_BUILDER_ESCORT</MultiUnitFormationType>
+			<PrimaryUnitType>UNITAI_WORKER</PrimaryUnitType>
+			<SecondaryUnitType>UNITAI_WORKER</SecondaryUnitType>
+			<MultiUnitPositionType>MUPOSITION_CIVILIAN_SUPPORT</MultiUnitPositionType>
+			<RequiredSlot>true</RequiredSlot>
+		</Row>
+		<Row>
+			<MultiUnitFormationType>MUFORMATION_BUILDER_ESCORT</MultiUnitFormationType>
+			<PrimaryUnitType>UNITAI_DEFENSE</PrimaryUnitType>
+			<SecondaryUnitType>UNITAI_COUNTER</SecondaryUnitType>
+			<MultiUnitPositionType>MUPOSITION_FRONT_LINE</MultiUnitPositionType>
+		</Row>
+		<!-- Archaeologist Escort -->
+		<Row>
+			<MultiUnitFormationType>MUFORMATION_ARCHAEOLOGIST_ESCORT</MultiUnitFormationType>
+			<PrimaryUnitType>UNITAI_ARCHAEOLOGIST</PrimaryUnitType>
+			<SecondaryUnitType>UNITAI_ARCHAEOLOGIST</SecondaryUnitType>
+			<MultiUnitPositionType>MUPOSITION_CIVILIAN_SUPPORT</MultiUnitPositionType>
+			<RequiredSlot>true</RequiredSlot>
+		</Row>
+		<Row>
+			<MultiUnitFormationType>MUFORMATION_ARCHAEOLOGIST_ESCORT</MultiUnitFormationType>
+			<PrimaryUnitType>UNITAI_DEFENSE</PrimaryUnitType>
+			<SecondaryUnitType>UNITAI_COUNTER</SecondaryUnitType>
+			<MultiUnitPositionType>MUPOSITION_FRONT_LINE</MultiUnitPositionType>
+		</Row>
+		<!-- Great General Escort -->
+		<Row>
+			<MultiUnitFormationType>MUFORMATION_GENERAL_ESCORT</MultiUnitFormationType>
+			<PrimaryUnitType>UNITAI_GENERAL</PrimaryUnitType>
+			<SecondaryUnitType>UNITAI_GENERAL</SecondaryUnitType>
+			<MultiUnitPositionType>MUPOSITION_CIVILIAN_SUPPORT</MultiUnitPositionType>
+			<RequiredSlot>true</RequiredSlot>
+		</Row>
+		<Row>
+			<MultiUnitFormationType>MUFORMATION_GENERAL_ESCORT</MultiUnitFormationType>
+			<PrimaryUnitType>UNITAI_DEFENSE</PrimaryUnitType>
+			<SecondaryUnitType>UNITAI_COUNTER</SecondaryUnitType>
+			<MultiUnitPositionType>MUPOSITION_FRONT_LINE</MultiUnitPositionType>
+			<RequiredSlot>true</RequiredSlot>
+		</Row>
 	</MultiUnitFormation_SlotEntries>
 </GameData>

CvGameCoreDLLUtil/include/CvEnums.h

@@ -2564,6 +2564,9 @@ enum CLOSED_ENUM MultiunitFormationTypes
 	MUFORMATION_LATE_GAME_INVASION_FORCE,
 	MUFORMATION_LATE_GAME_PURE_NAVAL_FORCE,
 	MUFORMATION_CARRIER_ESCORT,
+	MUFORMATION_BUILDER_ESCORT,
+	MUFORMATION_ARCHAEOLOGIST_ESCORT,
+	MUFORMATION_GENERAL_ESCORT,
 	MUFORMATION_DIPLOMAT_ESCORT,
 
 	NUM_MULTIUNITFORMATIONS ENUM_META_VALUE