Merge pull request #9541 from reaperrr/rename-rendertraits-xy

Rename WithTurret, WithBarrel and WithReloadingTurret to include 'Sprite' in trait name

mods/cnc/rules/vehicles.yaml

@@ -114,7 +114,7 @@ APC:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleOverlay:
-	WithTurret:
+	WithSpriteTurret:
 	AutoTarget:
 	Cargo:
 		Types: Infantry
@@ -220,7 +220,7 @@ BGGY:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleOverlay:
-	WithTurret:
+	WithSpriteTurret:
 	AutoTarget:
 	SpawnActorOnDeath:
 		Actor: BGGY.Husk
@@ -290,7 +290,7 @@ JEEP:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleOverlay:
-	WithTurret:
+	WithSpriteTurret:
 	AutoTarget:
 	SpawnActorOnDeath:
 		Actor: JEEP.Husk
@@ -325,7 +325,7 @@ LTNK:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleOverlay:
-	WithTurret:
+	WithSpriteTurret:
 	AutoTarget:
 	SpawnActorOnDeath:
 		Actor: LTNK.Husk
@@ -359,7 +359,7 @@ MTNK:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleOverlay:
-	WithTurret:
+	WithSpriteTurret:
 	AutoTarget:
 	SpawnActorOnDeath:
 		Actor: MTNK.Husk
@@ -387,7 +387,7 @@ HTNK:
 		Type: Heavy
 	RevealsShroud:
 		Range: 6c0
-	WithTurret:
+	WithSpriteTurret:
 	Turreted:
 		ROT: 3
 	Armament@PRIMARY:
@@ -445,7 +445,7 @@ MSAM:
 		Weapon: 227mm
 		LocalOffset: 213,-128,0, 213,128,0
 	AttackFrontal:
-	WithTurret:
+	WithSpriteTurret:
 		AimSequence: aim
 	AutoTarget:
 	SpawnActorOnDeath:
@@ -485,7 +485,7 @@ MLRS:
 		ReloadCount: 1
 		SelfReloadTicks: 100
 	AttackTurreted:
-	WithReloadingTurret:
+	WithReloadingSpriteTurret:
 		AmmoPoolName: primary
 	AutoTarget:
 		InitialStanceAI: Defend

mods/d2k/rules/defaults.yaml

@@ -284,7 +284,7 @@
 
 ^Defense:
 	Inherits: ^Building
-	WithTurret:
+	WithSpriteTurret:
 	AttackTurreted:
 	AutoTarget:
 	RenderRangeCircle:

mods/d2k/rules/vehicles.yaml

@@ -205,7 +205,7 @@ siege_tank:
 		MuzzleSequence: muzzle
 	AttackFrontal:
 	WithMuzzleOverlay:
-	WithTurret:
+	WithSpriteTurret:
 	Explodes:
 		Weapon: UnitExplodeMed
 		EmptyWeapon: UnitExplodeMed
@@ -465,7 +465,7 @@ deviator:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleOverlay:
-	WithTurret:
+	WithSpriteTurret:
 	AutoTarget:
 	Explodes:
 		Weapon: UnitExplodeMed

mods/ra/maps/allies-03b/map.yaml

@@ -1388,7 +1388,7 @@ Rules:
 		-Huntable:
 		-Targetable:
 		-Armament:
-		-WithTurret:
+		-WithSpriteTurret:
 		-WithMuzzleOverlay:
 		Cargo:
 			Types: ~disabled

mods/ra/maps/monster-tank-madness/map.yaml

@@ -2209,7 +2209,7 @@ Rules:
 			MuzzleSequence: muzzle
 		AttackTurreted:
 		WithMuzzleOverlay:
-		WithTurret:
+		WithSpriteTurret:
 		AutoTarget:
 		Explodes:
 			Weapon: MiniNuke

mods/ra/rules/ships.yaml

@@ -149,7 +149,7 @@ DD:
 	AttackTurreted:
 	SelectionDecorations:
 		VisualBounds: 38,38
-	WithTurret:
+	WithSpriteTurret:
 	AutoTarget:
 	DetectCloaked:
 		CloakTypes: Underwater
@@ -204,9 +204,9 @@ CA:
 	WithMuzzleOverlay:
 	SelectionDecorations:
 		VisualBounds: 44,44
-	WithTurret@PRIMARY:
+	WithSpriteTurret@PRIMARY:
 		Turret: primary
-	WithTurret@SECONDARY:
+	WithSpriteTurret@SECONDARY:
 		Turret: secondary
 	AutoTarget:
 
@@ -277,7 +277,7 @@ PT:
 	WithMuzzleOverlay:
 	SelectionDecorations:
 		VisualBounds: 36,36
-	WithTurret:
+	WithSpriteTurret:
 	AutoTarget:
 	DetectCloaked:
 		CloakTypes: Underwater

mods/ra/rules/vehicles.yaml

@@ -61,7 +61,7 @@ V2RL:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleOverlay:
-	WithTurret:
+	WithSpriteTurret:
 	AutoTarget:
 	SpawnActorOnDeath:
 		Actor: 1TNK.Husk
@@ -98,7 +98,7 @@ V2RL:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleOverlay:
-	WithTurret:
+	WithSpriteTurret:
 	AutoTarget:
 	SpawnActorOnDeath:
 		Actor: 2TNK.Husk
@@ -137,7 +137,7 @@ V2RL:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleOverlay:
-	WithTurret:
+	WithSpriteTurret:
 	AutoTarget:
 	SpawnActorOnDeath:
 		Actor: 3TNK.Husk
@@ -185,7 +185,7 @@ V2RL:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleOverlay:
-	WithTurret:
+	WithSpriteTurret:
 	AutoTarget:
 	SpawnActorOnDeath:
 		Actor: 4TNK.Husk
@@ -344,7 +344,7 @@ JEEP:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleOverlay:
-	WithTurret:
+	WithSpriteTurret:
 	AutoTarget:
 	Cargo:
 		Types: Infantry
@@ -608,7 +608,7 @@ FTRK:
 		MuzzleSequence: muzzle
 	AttackTurreted:
 	WithMuzzleOverlay:
-	WithTurret:
+	WithSpriteTurret:
 	AutoTarget:
 	SelectionDecorations:
 		VisualBounds: 28,28
@@ -738,7 +738,7 @@ STNK:
 	Turreted:
 		ROT: 5
 	AttackTurreted:
-	WithTurret:
+	WithSpriteTurret:
 	Cargo:
 		Types: Infantry
 		MaxWeight: 4

mods/ts/rules/gdi-support.yaml

@@ -62,17 +62,17 @@ GACTWR:
 		UpgradeMinEnabledLevel: 1
 	CanPowerDown:
 		IndicatorPalette: mouse
-	WithTurret@VULC:
+	WithSpriteTurret@VULC:
 		UpgradeTypes: tower.vulcan
 		UpgradeMinEnabledLevel: 1
 		Recoils: no
 		Sequence: turret-vulcan
-	WithTurret@ROCKET:
+	WithSpriteTurret@ROCKET:
 		UpgradeTypes: tower.rocket
 		UpgradeMinEnabledLevel: 1
 		Recoils: no
 		Sequence: turret-rocket
-	WithTurret@SAM:
+	WithSpriteTurret@SAM:
 		UpgradeTypes: tower.sam
 		UpgradeMinEnabledLevel: 1
 		Recoils: no

mods/ts/rules/gdi-vehicles.yaml

@@ -145,7 +145,7 @@ MMCH:
 		ROT: 5
 	AttackTurreted:
 		Voice: Attack
-	WithTurret:
+	WithSpriteTurret:
 		Recoils: no
 	Armament:
 		Weapon: 120mm

mods/ts/rules/nod-support.yaml

@@ -134,7 +134,7 @@ NASAM:
 		ROT: 10
 		InitialFacing: 50
 	AttackTurreted:
-	WithTurret:
+	WithSpriteTurret:
 		Recoils: no
 	Armament:
 		Weapon: RedEye2

mods/ts/rules/shared-support.yaml

@@ -28,7 +28,7 @@ NAPULS:
 	AttackTurreted:
 	Armament:
 		Weapon: EMPulseCannon
-	WithTurret:
+	WithSpriteTurret:
 		Sequence: turret
 	Power:
 		Amount: -150