Merge pull request #12627 from GraionDilach/veins-fix

Fix vein attack animation moving along with target.

OpenRA.Mods.Common/Traits/Render/LeavesTrails.cs

@@ -49,7 +49,8 @@ namespace OpenRA.Mods.Common.Traits.Render
 		[Desc("Delay between trail updates when moving.")]
 		public readonly int MovingInterval = 0;
 
-		[Desc("Delay before first trail.")]
+		[Desc("Delay before first trail.",
+			"Use negative values for falling back to the *Interval values.")]
 		public readonly int StartDelay = 0;
 
 		[Desc("Trail spawn positions relative to actor position. (forward, right, up) triples")]
@@ -100,7 +101,7 @@ namespace OpenRA.Mods.Common.Traits.Render
 			if ((isMoving && !Info.TrailWhileMoving) || (!isMoving && !Info.TrailWhileStationary))
 				return;
 
-			if (isMoving == wasStationary)
+			if (isMoving == wasStationary && (Info.StartDelay > -1))
 			{
 				cachedInterval = Info.StartDelay;
 				ticks = 0;

mods/ts/rules/defaults.yaml

@@ -887,9 +887,12 @@
 		DamageInterval: 16
 		DamageTypes: BulletDeath
 		Terrain: Veins
-	GrantConditionOnTerrain@VEINS:
+	LeavesTrails@VEINS:
+		Image: veins
+		Palette: player
 		TerrainTypes: Veins
-		Condition: veins
-	WithIdleOverlay@VEINS:
-		Sequence: veins
-		RequiresCondition: veins
+		TrailWhileStationary: true
+		StationaryInterval: 16
+		MovingInterval: 16
+		StartDelay: -1
+		SpawnAtLastPosition: false

mods/ts/rules/gdi-vehicles.yaml

@@ -99,8 +99,7 @@ HVR:
 		StationaryInterval: 18
 		MovingInterval: 6
 	-DamagedByTerrain@VEINS:
-	-GrantConditionOnTerrain@VEINS:
-	-WithIdleOverlay@VEINS:
+	-LeavesTrails@VEINS:
 
 SMECH:
 	Inherits: ^Vehicle
@@ -142,8 +141,7 @@ SMECH:
 	Selectable:
 		Bounds: 20, 32, 0, -8
 	-DamagedByTerrain@VEINS:
-	-GrantConditionOnTerrain@VEINS:
-	-WithIdleOverlay@VEINS:
+	-LeavesTrails@VEINS:
 
 MMCH:
 	Inherits: ^Tank

mods/ts/rules/nod-vehicles.yaml

@@ -31,8 +31,7 @@ BGGY:
 	AutoTarget:
 	WithMuzzleOverlay:
 	-DamagedByTerrain@VEINS:
-	-GrantConditionOnTerrain@VEINS:
-	-WithIdleOverlay@VEINS:
+	-LeavesTrails@VEINS:
 
 BIKE:
 	Inherits: ^Vehicle
@@ -268,8 +267,7 @@ WEED:
 	-WithVoxelBody:
 	WithVoxelUnloadBody:
 	-DamagedByTerrain@VEINS:
-	-GrantConditionOnTerrain@VEINS:
-	-WithIdleOverlay@VEINS:
+	-LeavesTrails@VEINS:
 
 SAPC:
 	Inherits: ^Tank

mods/ts/rules/shared-vehicles.yaml

@@ -101,8 +101,7 @@ HARV:
 			gdi: harv.gdi
 			nod: harv.nod
 	-DamagedByTerrain@VEINS:
-	-GrantConditionOnTerrain@VEINS:
-	-WithIdleOverlay@VEINS:
+	-LeavesTrails@VEINS:
 
 LPST:
 	Inherits: ^Tank

mods/ts/sequences/misc.yaml

@@ -357,6 +357,13 @@ resources:
 		Tick: 180
 		Offset: 0, -12, 2.5
 
+veins:
+	idle: veinatac
+		Length: 12
+		UseTilesetExtension: true
+		ZOffset: 1023
+		Offset: 0, -12, 24
+
 shroud:
 	Defaults:
 		Offset: 0, -1

mods/ts/sequences/vehicles.yaml

@@ -3,11 +3,6 @@
 		Offset: 0, 0, 24
 		Length: *
 		BlendMode: Additive
-	veins: veinatac
-		Length: 12
-		UseTilesetExtension: true
-		ZOffset: 1023
-		Offset: 0, -12, 24
 
 mcv.gdi:
 	Inherits: ^VehicleOverlays