Remove custom cnc behavior

mods/cnc/defaults.yaml

@@ -51,12 +51,13 @@
 		TargetTypes: Air
 	Selectable:
 		Voice: VehicleVoice
+	Helicopter:
+		RepairBuildings: hpad
+		RearmBuildings:
+		LandWhenIdle: false
 	HiddenUnderFog:
 	GainsExperience:
 	GivesExperience:
-	MobileAir:
-		TerrainTypes: Clear, Rough, Road, Tree, Water, Rock, Wall, Ore, Beach, River
-		TerrainSpeeds: 100%, 100%, 100%, 100%, 100%, 100%, 100%, 100%, 100%, 100%
 	DrawLineToTarget:
 	ActorLostNotification:
 		Notification: unitlost.aud

mods/cnc/structures.yaml

@@ -334,7 +334,7 @@ HPAD:
 	RevealsShroud:
 		Range: 5
 	Bib:
-	Production:
+	ProducesHelicopters:
 		SpawnOffset: 0,-4
 		Produces: Plane
 	BelowUnits:

mods/cnc/system.yaml

@@ -47,7 +47,6 @@ World:
 #	WaterPaletteRotation:
 	BuildingInfluence:
 	UnitInfluence:
-	AircraftInfluence:
 	BridgeLayer:
 		Bridges: bridge1, bridge2, bridge3, bridge4
 	PaletteFromCurrentTheatre:

mods/cnc/vehicles.yaml

@@ -400,8 +400,8 @@ TRAN:
 		Cost: 1500
 		Description: Chinook Transport
 		LongDesc: Fast Infantry Transport Helicopter.\n  Unarmed
-	MobileAir:
-		InitialFacing: 20
+	Helicopter:
+		LandWhenIdle: true
 		ROT: 5
 		Speed: 15
 	Health:
@@ -428,8 +428,7 @@ HELI:
 		Cost: 1200
 		Description: Apache Longbow
 		LongDesc: Helicopter Gunship with AG Missiles.\n  Strong vs Buildings, Tanks\n  Weak vs Infantry
-	MobileAir:
-		InitialFacing: 20
+	Helicopter:
 		ROT: 4
 		Speed: 20
 	Health:
@@ -437,7 +436,7 @@ HELI:
 		Armor: heavy
 	RevealsShroud:
 		Range: 8
-	AttackBase:
+	AttackHeli:
 		PrimaryWeapon: HighV
 		SecondaryWeapon: HighV
 		PrimaryOffset: -5,0,0,2
@@ -457,8 +456,7 @@ ORCA:
 		Cost: 1200
 		Description: Orca
 		LongDesc: Helicopter Gunship with AG Missiles.\n  Strong vs Buildings, Tanks\n  Weak vs Infantry
-	MobileAir:
-		InitialFacing: 20
+	Helicopter:
 		ROT: 4
 		Speed: 20
 	Health:
@@ -466,7 +464,7 @@ ORCA:
 		Armor: heavy
 	RevealsShroud:
 		Range: 8
-	AttackBase:
+	AttackHeli:
 		PrimaryWeapon: Rockets.Orca
 		SecondaryWeapon: Rockets.Orca
 		PrimaryOffset: -5,0,0,2