Merge pull request #4036 from pchote/aircraft-polish

C&C aircraft polish.

mods/cnc/rules/aircraft.yaml

@@ -166,6 +166,18 @@ C17:
 	-GainsExperience:
 	FlyAwayOnIdle:
 	RejectsOrders:
+	Contrail@1:
+		Offset: -261,-650,0
+		TrailLength: 15
+	Contrail@2:
+		Offset: -85,-384,0
+		TrailLength: 16
+	Contrail@3:
+		Offset: -85,384,0
+		TrailLength: 16
+	Contrail@4:
+		Offset: -261,650,0
+		TrailLength: 15
 
 A10:
 	Inherits: ^Plane
@@ -185,15 +197,29 @@ A10:
 		Range: 12
 	RenderUnit:
 	WithShadow:
-	LimitedAmmo:
-		Ammo: 10
-	CarpetBomb:
+	AttackBomber:
+		Guns: gun
+		Bombs: bombs
+	Armament@GUNS:
+		Name: gun
+		Weapon: Vulcan
+		LocalOffset: 1024,0,-85
+	WithMuzzleFlash@SECONDARY:
+		Armament: gun
+	Armament@BOMBS:
+		Name: bombs
 		Weapon: Napalm
-		Range: 3
+		LocalOffset: 0,-256,-43, 0,256,-43
 	-Selectable:
 	-GainsExperience:
 	FlyAwayOnIdle:
 	RejectsOrders:
+	Contrail@1:
+		Offset: -640,171,0
+		TrailLength: 15
+	Contrail@2:
+		Offset: -640,-171,0
+		TrailLength: 15
 
 TRAN.Husk:
 	Inherits: ^HelicopterHusk

mods/cnc/rules/structures.yaml

@@ -375,6 +375,8 @@ HQ:
 	AirstrikePower:
 		Icon: airstrike
 		ChargeTime: 180
+		SquadSize: 3
+		QuantizedFacings: 8
 		Description: Air Strike
 		LongDesc: Deploy an aerial napalm strike.\nBurns buildings and infantry along a line.
 		EndChargeSound: airredy1.aud

mods/cnc/sequences/aircraft.yaml

@@ -60,5 +60,9 @@ a10:
 	idle:
 		Start: 0
 		Facings: 32
+	muzzle: minigun
+		Start: 0
+		Length: 6
+		Facings: 8
 	icon: a10icnh
 		Start: 0

mods/cnc/weapons.yaml

@@ -725,8 +725,30 @@ TowerMissle:
 		SmudgeType: Crater
 		Damage: 45
 
-Napalm:
+Vulcan:
+	ValidTargets: Ground, Water
 	ROF: 2
+	Range: 6
+	Report: gun5.aud
+	Projectile: Bullet
+		Speed: 100
+	Warhead:
+		Damage: 75
+		Spread: 10
+		Versus:
+			None: 100%
+			Wood: 50%
+			Light: 100%
+			Heavy: 25%
+		InfDeath: 2
+		Explosion: piffs
+
+Napalm:
+	ValidTargets: Ground, Water
+	ROF: 4
+	Range: 2
+	Burst: 2
+	BurstDelay: 2
 	Projectile: GravityBomb
 		Image: BOMBLET
 	Warhead:
@@ -738,9 +760,10 @@ Napalm:
 			Heavy: 55%
 		InfDeath: 5
 		Explosion: med_napalm
+		WaterExplosion: med_napalm
 		ImpactSound: flamer2.aud
 		SmudgeType: Scorch
-		Damage: 130
+		Damage: 50
 
 Napalm.Crate:
 	Warhead: