Merge the 3 turret rendering traits into WithTurret.

mods/ra/rules/ships.yaml

@@ -130,7 +130,8 @@ DD:
 	AttackTurreted:
 	Selectable:
 		Bounds: 38,38
-	RenderUnitTurreted:
+	RenderUnit:
+	WithTurret:
 	AutoTarget:
 	Chronoshiftable:
 	IronCurtainable:
@@ -185,7 +186,11 @@ CA:
 	AttackTurreted:
 	Selectable:
 		Bounds: 44,44
-	RenderUnitTurreted:
+	RenderUnit:
+	WithTurret@PRIMARY:
+		Turret: primary
+	WithTurret@SECONDARY:
+		Turret: secondary
 	AutoTarget:
 	Chronoshiftable:
 	IronCurtainable:
@@ -255,7 +260,8 @@ PT:
 	AttackTurreted:
 	Selectable:
 		Bounds: 32,32
-	RenderUnitTurreted:
+	RenderUnit:
+	WithTurret:
 	AutoTarget:
 	Chronoshiftable:
 	IronCurtainable:

mods/ra/rules/vehicles.yaml

@@ -55,7 +55,8 @@ V2RL:
 		Recoil: 85
 		RecoilRecovery: 25
 	AttackTurreted:
-	RenderUnitTurreted:
+	RenderUnit:
+	WithTurret:
 	AutoTarget:
 	Explodes:
 		Weapon: UnitExplodeSmall
@@ -92,7 +93,8 @@ V2RL:
 		Recoil: 128
 		RecoilRecovery: 38
 	AttackTurreted:
-	RenderUnitTurreted:
+	RenderUnit:
+	WithTurret:
 	AutoTarget:
 	Explodes:
 		Weapon: UnitExplodeSmall
@@ -132,7 +134,8 @@ V2RL:
 		RecoilRecovery: 38
 		LocalOffset: 0,85,0, 0,-85,0
 	AttackTurreted:
-	RenderUnitTurreted:
+	RenderUnit:
+	WithTurret:
 	AutoTarget:
 	Explodes:
 		Weapon: UnitExplodeSmall
@@ -177,7 +180,8 @@ V2RL:
 		LocalYaw: -100,100
 		Recoil: 43
 	AttackTurreted:
-	RenderUnitTurreted:
+	RenderUnit:
+	WithTurret:
 	AutoTarget:
 	Explodes:
 		Weapon: UnitExplodeSmall
@@ -332,7 +336,8 @@ JEEP:
 		Weapon: M60mg
 	AttackTurreted:
 	WithMuzzleFlash:
-	RenderUnitTurreted:
+	RenderUnit:
+	WithTurret:
 	AutoTarget:
 	Cargo:
 		Types: Infantry
@@ -667,7 +672,8 @@ FTRK:
 		Weapon: FLAK-23
 		Recoil: 85
 	AttackTurreted:
-	RenderUnitTurreted:
+	RenderUnit:
+	WithTurret:
 	AutoTarget:
 	Explodes:
 		Weapon: UnitExplodeSmall