Merge the 3 turret rendering traits into WithTurret.

mods/d2k/rules/atreides.yaml

@@ -138,8 +138,9 @@ COMBATA:
 		RecoilRecovery: 34
 		LocalOffset: 85,0,128
 	AttackTurreted:
-	RenderUnitTurreted:
+	RenderUnit:
 		Image: COMBATA
+	WithTurret:
 	LeavesHusk:
 		HuskActor: Combata.Husk
 

mods/d2k/rules/harkonnen.yaml

@@ -163,8 +163,9 @@ COMBATH:
 		ROT: 5
 	Health:
 		HP: 440
-	RenderUnitTurreted:
+	RenderUnit:
 		Image: COMBATH
+	WithTurret:
 	LeavesHusk:
 		HuskActor: Combath.Husk
 

mods/d2k/rules/ordos.yaml

@@ -108,8 +108,9 @@ COMBATO:
 		Speed: 9
 		ROT: 8
 		Crushes: crate, infantry
-	RenderUnitTurreted:
+	RenderUnit:
 		Image: COMBATO
+	WithTurret:
 	LeavesHusk:
 		HuskActor: Combato.Husk
 

mods/d2k/rules/structures.yaml

@@ -402,11 +402,11 @@ GUNTOWER:
 	RevealsShroud:
 		Range: 8
 	RenderRangeCircle:
-	-RenderBuilding:
 	-AutoTargetIgnore:
-	RenderBuildingSeparateTurret:
+	RenderBuilding:
 		HasMakeAnimation: false
 		Image: guntowera
+	WithTurret:
 	Turreted:
 		ROT: 6
 		InitialFacing: 128
@@ -460,11 +460,11 @@ ROCKETTOWER:
 	RevealsShroud:
 		Range: 10
 	RenderRangeCircle:
-	-RenderBuilding:
 	-AutoTargetIgnore:
-	RenderBuildingSeparateTurret:
+	RenderBuilding:
 		HasMakeAnimation: false
 		Image: rockettowera
+	WithTurret:
 	Armament:
 		Weapon: TowerMissile
 		LocalOffset: 85,597,469, 85,-597,469

mods/d2k/rules/vehicles.yaml

@@ -223,7 +223,8 @@ QUAD.starport:
 		RecoilRecovery: 34
 		LocalOffset: 85,0,128
 	AttackTurreted:
-	RenderUnitTurreted:
+	RenderUnit:
+	WithTurret:
 	AutoTarget:
 	Explodes:
 		Weapon: UnitExplodeSmall
@@ -272,8 +273,9 @@ SIEGETANK:
 		RecoilRecovery: 19
 		LocalOffset: 171,0,299
 	AttackTurreted:
-	RenderUnitTurreted:
+	RenderUnit:
 		Image: SIEGETANK
+	WithTurret:
 	Explodes:
 		Weapon: UnitExplodeScale
 		EmptyWeapon: UnitExplodeScale