Some necessary functions & fix for AttackOverlay

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

@@ -17,6 +17,9 @@ namespace OpenRA.Mods.Common.Traits.Render
 	[Desc("Rendered together with an attack.")]
 	public class WithAttackOverlayInfo : TraitInfo, Requires<RenderSpritesInfo>
 	{
+		[Desc("Armament that will play the animation. Set to null to allow all armaments.")]
+		public readonly string Armament = null;
+
 		[SequenceReference]
 		[FieldLoader.Require]
 		[Desc("Sequence name to use")]
@@ -29,6 +32,8 @@ public class WithAttackOverlayInfo : TraitInfo, Requires<RenderSpritesInfo>
 		[Desc("Custom palette is a player palette BaseName")]
 		public readonly bool IsPlayerPalette = false;
 
+		public readonly bool IsDecoration = false;
+
 		[Desc("Delay in ticks before overlay starts, either relative to attack preparation or attack.")]
 		public readonly int Delay = 0;
 
@@ -52,10 +57,15 @@ public WithAttackOverlay(ActorInitializer init, WithAttackOverlayInfo info)
 			this.info = info;
 
 			renderSprites = init.Self.Trait<RenderSprites>();
+			var body = init.Self.TraitOrDefault<BodyOrientation>();
+			var facing = init.Self.TraitOrDefault<IFacing>();
 
-			overlay = new Animation(init.World, renderSprites.GetImage(init.Self), RenderSprites.MakeFacingFunc(init.Self));
+			overlay = new Animation(init.World, renderSprites.GetImage(init.Self), facing == null ? () => WAngle.Zero : (body == null ? () => facing.Facing : () => body.QuantizeFacing(facing.Facing)))
+			{
+				IsDecoration = info.IsDecoration
+			};
 
-			renderSprites.Add(new AnimationWithOffset(overlay, null, () => !attacking),
+			renderSprites.Add(new AnimationWithOffset(overlay, null, () => !attacking, p => RenderUtils.ZOffsetFromCenter(init.Self, p, 1)),
 				info.Palette, info.IsPlayerPalette);
 		}
 
@@ -67,7 +77,7 @@ void PlayOverlay()
 
 		void INotifyAttack.Attacking(Actor self, in Target target, Armament a, Barrel barrel)
 		{
-			if (info.DelayRelativeTo == AttackDelayType.Attack)
+			if (info.DelayRelativeTo == AttackDelayType.Attack && (string.IsNullOrEmpty(info.Armament) || info.Armament == a.Info.Name))
 			{
 				if (info.Delay > 0)
 					tick = info.Delay;
@@ -78,7 +88,7 @@ void INotifyAttack.Attacking(Actor self, in Target target, Armament a, Barrel ba
 
 		void INotifyAttack.PreparingAttack(Actor self, in Target target, Armament a, Barrel barrel)
 		{
-			if (info.DelayRelativeTo == AttackDelayType.Preparation)
+			if (info.DelayRelativeTo == AttackDelayType.Preparation && (string.IsNullOrEmpty(info.Armament) || info.Armament == a.Info.Name))
 			{
 				if (info.Delay > 0)
 					tick = info.Delay;

mods/ts/rules/gdi-vehicles.yaml

@@ -139,22 +139,19 @@ SMECH:
 		FacingTolerance: 0
 	Armament:
 		Weapon: AssaultCannon
+		LocalOffset: 0,0,620
 	Voiced:
 		VoiceSet: Mech
-	QuantizeFacingsFromSequence:
-		Sequence: stand
-	WithFacingSpriteBody:
-		Sequence: stand
-		Palette: player-nomuzzle
-		IsPlayerPalette: True
-	WithAttackAnimation:
-		Sequence: shoot
+	WithInfantryBody:
+		DefaultAttackSequence: shoot
+		RequiresCondition: !inside-tunnel
+	BodyOrientation:
+		QuantizedFacings: 8
+		CameraPitch: 250
 	WithAttackOverlay@muzzle:
 		Sequence: shoot-muzzle
 		Palette: muzzle
-	WithMoveAnimation:
-		MoveSequence: walk
-		ValidMovementTypes: Horizontal, Turn
+		IsDecoration: true
 	Selectable:
 		Bounds: 603, 1930, 0, -482
 	-DamagedByTerrain@VEINS:

mods/ts/sequences/vehicles.yaml

@@ -318,7 +318,7 @@ smech:
 		Start: 96
 		Facings: -8
 		ShadowStart: 232
-	walk:
+	run:
 		Facings: -8
 		Length: 12
 		ShadowStart: 136