Merge pull request #4092 from pchote/vice-fix

Fix viceroids and add contrails to C&C rockets.

mods/cnc/rules/civilian.yaml

@@ -441,8 +441,15 @@ VICE:
 		Name: Viceroid
 	Armament:
 		Weapon: Chemspray
+		LocalOffset: 384,0,0
 	AttackFrontal:
 	AttackWander:
 	RenderUnit:
 	WithMuzzleFlash:
+		SplitFacings: true
+	CombatDebugOverlay:
+	Guard:
+	Guardable:
+	UpdatesPlayerStatistics:
 	BodyOrientation:
+		QuantizedFacings: 8

mods/cnc/sequences/infantry.yaml

@@ -2,10 +2,38 @@ vice:
 	idle:
 		Start: 0
 		Length: *
-	muzzle: chem
+	muzzle0: chem-n
 		Start: 0
-		Length: 13
+		Length: *
-		Facings: 8
+		Offset: 3,4
+	muzzle1: chem-nw
+		Start: 0
+		Length: *
+		Offset: 4,1
+	muzzle2: chem-w
+		Start: 0
+		Length: *
+		Offset: 7,-3
+	muzzle3: chem-sw
+		Start: 0
+		Length: *
+		Offset: 3,-6
+	muzzle4: chem-s
+		Start: 0
+		Length: *
+		Offset: 1,-6
+	muzzle5: chem-se
+		Start: 0
+		Length: *
+		Offset: -3,-5
+	muzzle6: chem-e
+		Start: 0
+		Length: *
+		Offset: -6,-3
+	muzzle7: chem-ne
+		Start: 0
+		Length: *
+		Offset: -1,0
 	icon: viceicnh
 		Start: 0
 
@@ -13,10 +41,38 @@ pvice:
 	idle:
 		Start: 0
 		Length: *
-	muzzle: chem
+	muzzle0: chem-n
 		Start: 0
-		Length: 13
+		Length: *
-		Facings: 8
+		Offset: 3,4
+	muzzle1: chem-nw
+		Start: 0
+		Length: *
+		Offset: 4,1
+	muzzle2: chem-w
+		Start: 0
+		Length: *
+		Offset: 7,-3
+	muzzle3: chem-sw
+		Start: 0
+		Length: *
+		Offset: 3,-6
+	muzzle4: chem-s
+		Start: 0
+		Length: *
+		Offset: 1,-6
+	muzzle5: chem-se
+		Start: 0
+		Length: *
+		Offset: -3,-5
+	muzzle6: chem-e
+		Start: 0
+		Length: *
+		Offset: -6,-3
+	muzzle7: chem-ne
+		Start: 0
+		Length: *
+		Offset: -1,0
 	icon: viceicnh
 		Start: 0
 

mods/cnc/weapons.yaml

@@ -230,6 +230,7 @@ Rockets:
 		Image: DRAGON
 		ROT: 15
 		Trail: smokey
+		ContrailLength: 8
 		Speed: 35
 		RangeLimit: 30
 	Warhead:
@@ -262,6 +263,7 @@ BikeRockets:
 		Image: DRAGON
 		ROT: 10
 		Trail: smokey
+		ContrailLength: 8
 		Speed: 35
 		RangeLimit: 40
 	Warhead:
@@ -293,7 +295,8 @@ OrcaAGMissiles:
 		Inaccuracy: 3
 		Image: DRAGON
 		ROT: 10
-		Trail: fb4
+		Trail: smokey
+		ContrailLength: 8
 		Speed: 25
 		RangeLimit: 30
 	Warhead:
@@ -324,7 +327,8 @@ OrcaAAMissiles:
 		Inaccuracy: 3
 		Image: DRAGON
 		ROT: 10
-		Trail: fb4
+		Trail: smokey
+		ContrailLength: 8
 		Speed: 25
 		RangeLimit: 30
 	Warhead:
@@ -542,6 +546,7 @@ MammothMissiles:
 		Image: DRAGON
 		ROT: 10
 		Trail: smokey
+		ContrailLength: 8
 		Speed: 25
 		RangeLimit: 35
 	Warhead:
@@ -605,6 +610,7 @@ MammothMissiles:
 		Image: DRAGON
 		ROT: 10
 		Trail: smokey
+		ContrailLength: 8
 		Speed: 25
 		RangeLimit: 55
 	Warhead:
@@ -679,6 +685,7 @@ BoatMissile:
 		Image: DRAGON
 		ROT: 10
 		Trail: smokey
+		ContrailLength: 8
 		Speed: 20
 		RangeLimit: 60
 	Warhead:
@@ -710,6 +717,7 @@ TowerMissle:
 		Image: DRAGON
 		ROT: 20
 		Trail: smokey
+		ContrailLength: 8
 		Speed: 35
 		RangeLimit: 40
 	Warhead:
@@ -810,6 +818,7 @@ SAMMissile:
 		Speed: 50
 		RangeLimit: 35
 		Trail: smokey
+		ContrailLength: 8
 	Warhead: AP
 		Spread: 16
 		Versus:
@@ -904,6 +913,7 @@ Patriot:
 		Shadow: no
 		Image: patriot
 		Trail: smokey
+		ContrailLength: 8
 		ROT: 20
 		Speed: 50
 		RangeLimit: 30