Kill RenderUnitRotor in favour of RenderUnit + WithRotor.

mods/cnc/rules/vehicles.yaml

@@ -473,9 +473,12 @@ TRAN:
 		Type: Light
 	RevealsShroud:
 		Range: 8
-	RenderUnitRotor:
-		PrimaryOffset: 0,14,0,-4
-		SecondaryOffset: 0,-14,0,-2
+	RenderUnit:
+	WithRotor@PRIMARY:
+		Offset: 0,14,0,-4
+	WithRotor@SECONDARY:
+		Id: rotor_2
+		Offset: 0,-14,0,-2
 	WithShadow:
 	Cargo:
 		Types: Infantry
@@ -508,9 +511,10 @@ HELI:
 		PrimaryWeapon: HighV.Heli
 		PrimaryOffset: 0,-10,0,3
 		FacingTolerance: 20
+	RenderUnit:
+	WithRotor:
+		Offset: 0,0,0,-2
 	WithMuzzleFlash:
-	RenderUnitRotor:
-		PrimaryOffset: 0,0,0,-2
 	WithShadow:
 	FallsToEarth:
 	AutoTarget:

mods/ra/rules/vehicles.yaml

@@ -830,9 +830,12 @@ TRAN:
 		ROT: 5
 		Speed: 12
 		LandableTerrainTypes: Clear,Rough,Road,Ore,Beach
-	RenderUnitRotor:
-		PrimaryOffset: 0,14,0,-8
-		SecondaryOffset: 0,-14,0,-5
+	RenderUnit:
+	WithRotor@PRIMARY:
+		Offset: 0,14,0,-8
+	WithRotor@SECONDARY:
+		Id: rotor_2
+		Offset: 0,-14,0,-5
 	WithShadow:
 	Cargo:
 		Types: Infantry
@@ -872,9 +875,10 @@ HELI:
 		InitialFacing: 20
 		ROT: 4
 		Speed: 16
-	RenderUnitRotor:
-		PrimaryOffset: 0,0,0,-2
+	RenderUnit:
 		Smokes: no
+	WithRotor:
+		Offset: 0,0,0,-2
 	WithShadow:
 	LimitedAmmo:
 		Ammo: 8
@@ -915,8 +919,9 @@ HIND:
 		InitialFacing: 20
 		ROT: 4
 		Speed: 12
-	RenderUnitRotor:
+	RenderUnit:
 		Smokes: no
+	WithRotor:
 	WithShadow:
 	LimitedAmmo:
 		Ammo: 24