Merge pull request #7638 from pchote/infantry-body

Decompose RenderInfantry into WithInfantryBody and RenderSprites.

OpenRA.Mods.Common/OpenRA.Mods.Common.csproj

@@ -373,7 +373,6 @@
     <Compile Include="Traits\Render\RenderEditorOnly.cs" />
     <Compile Include="Traits\Render\RenderFlare.cs" />
     <Compile Include="Traits\Render\RenderHarvester.cs" />
-    <Compile Include="Traits\Render\RenderInfantry.cs" />
     <Compile Include="Traits\Render\RenderNameTag.cs" />
     <Compile Include="Traits\Render\RenderSimple.cs" />
     <Compile Include="Traits\Render\RenderSprites.cs" />
@@ -616,6 +615,7 @@
     <Compile Include="Widgets\TooltipContainerWidget.cs" />
     <Compile Include="Widgets\ViewportControllerWidget.cs" />
     <Compile Include="Widgets\VqaPlayerWidget.cs" />
+    <Compile Include="Traits\Render\WithInfantryBody.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

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

@@ -148,7 +148,7 @@ namespace OpenRA.Mods.Common.Traits
 			return cachedImage = info.GetImage(self.Info, self.World.Map.SequenceProvider, race);
 		}
 
-		protected void UpdatePalette()
+		public void UpdatePalette()
 		{
 			foreach (var anim in anims.Values)
 				anim.OwnerChanged();

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

@@ -14,7 +14,7 @@ using OpenRA.Traits;
 namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("This actor has a death animation.")]
-	public class WithDeathAnimationInfo : ITraitInfo, Requires<RenderSimpleInfo>
+	public class WithDeathAnimationInfo : ITraitInfo, Requires<RenderSpritesInfo>
 	{
 		[Desc("Sequence to play when this actor is killed by a warhead.")]
 		public readonly string DeathSequence = "die";
@@ -35,12 +35,12 @@ namespace OpenRA.Mods.Common.Traits
 	public class WithDeathAnimation : INotifyKilled
 	{
 		public readonly WithDeathAnimationInfo Info;
-		readonly RenderSimple renderSimple;
+		readonly RenderSprites rs;
 
 		public WithDeathAnimation(Actor self, WithDeathAnimationInfo info)
 		{
 			Info = info;
-			renderSimple = self.Trait<RenderSimple>();
+			rs = self.Trait<RenderSprites>();
 		}
 
 		public void Killed(Actor self, AttackInfo e)
@@ -66,7 +66,7 @@ namespace OpenRA.Mods.Common.Traits
 			self.World.AddFrameEndTask(w =>
 			{
 				if (!self.Destroyed)
-					w.Add(new Corpse(w, self.CenterPosition, renderSimple.GetImage(self), sequence, palette));
+					w.Add(new Corpse(w, self.CenterPosition, rs.GetImage(self), sequence, palette));
 			});
 		}
 	}

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

@@ -16,18 +16,18 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common.Traits
 {
-	public class RenderInfantryInfo : RenderSimpleInfo, Requires<IMoveInfo>
+	public class WithInfantryBodyInfo : ITraitInfo, IQuantizeBodyOrientationInfo, IRenderActorPreviewSpritesInfo, Requires<IMoveInfo>, Requires<RenderSpritesInfo>
 	{
 		public readonly int MinIdleWaitTicks = 30;
 		public readonly int MaxIdleWaitTicks = 110;
-		public readonly string MoveAnimation = "run";
-		public readonly string AttackAnimation = "shoot";
-		public readonly string[] IdleAnimations = { };
-		public readonly string[] StandAnimations = { "stand" };
+		public readonly string MoveSequence = "run";
+		public readonly string AttackSequence = "shoot";
+		public readonly string[] IdleSequences = { };
+		public readonly string[] StandSequences = { "stand" };
 
-		public override object Create(ActorInitializer init) { return new RenderInfantry(init, this); }
+		public virtual object Create(ActorInitializer init) { return new WithInfantryBody(init, this); }
 
-		public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
+		public IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
 		{
 			var facing = 0;
 			var ifacing = init.Actor.Traits.GetOrDefault<IFacingInfo>();
@@ -35,20 +35,23 @@ namespace OpenRA.Mods.Common.Traits
 				facing = init.Contains<FacingInit>() ? init.Get<FacingInit, int>() : ifacing.GetInitialFacing();
 
 			var anim = new Animation(init.World, image, () => facing);
-			anim.PlayRepeating(StandAnimations.First());
+			anim.PlayRepeating(StandSequences.First());
 			yield return new SpriteActorPreview(anim, WVec.Zero, 0, p, rs.Scale);
 		}
 
-		public override int QuantizedBodyFacings(ActorInfo ai, SequenceProvider sequenceProvider, string race)
+		public int QuantizedBodyFacings(ActorInfo ai, SequenceProvider sequenceProvider, string race)
 		{
-			return sequenceProvider.GetSequence(GetImage(ai, sequenceProvider, race), StandAnimations.First()).Facings;
+			var rsi = ai.Traits.Get<RenderSpritesInfo>();
+			return sequenceProvider.GetSequence(rsi.GetImage(ai, sequenceProvider, race), StandSequences.First()).Facings;
 		}
 	}
 
-	public class RenderInfantry : RenderSimple, INotifyAttack, INotifyIdle
+	public class WithInfantryBody : ITick, INotifyAttack, INotifyIdle
 	{
-		readonly RenderInfantryInfo info;
+		readonly WithInfantryBodyInfo info;
 		readonly IMove move;
+		protected readonly Animation DefaultAnimation;
+
 		bool dirty = false;
 		string idleSequence;
 		int idleDelay;
@@ -58,11 +61,16 @@ namespace OpenRA.Mods.Common.Traits
 		bool IsModifyingSequence { get { return rsm != null && rsm.IsModifyingSequence; } }
 		bool wasModifying;
 
-		public RenderInfantry(ActorInitializer init, RenderInfantryInfo info)
-			: base(init, info, MakeFacingFunc(init.Self))
+		public WithInfantryBody(ActorInitializer init, WithInfantryBodyInfo info)
 		{
 			this.info = info;
-			DefaultAnimation.PlayFetchIndex(NormalizeInfantrySequence(init.Self, info.StandAnimations.Random(Game.CosmeticRandom)), () => 0);
+			var self = init.Self;
+			var rs = self.Trait<RenderSprites>();
+
+			DefaultAnimation = new Animation(init.World, rs.GetImage(self), RenderSprites.MakeFacingFunc(self));
+			rs.Add("", DefaultAnimation);
+
+			DefaultAnimation.PlayFetchIndex(NormalizeInfantrySequence(init.Self, info.StandSequences.Random(Game.CosmeticRandom)), () => 0);
 			state = AnimationState.Waiting;
 			move = init.Self.Trait<IMove>();
 			rsm = init.Self.TraitOrDefault<IRenderInfantrySequenceModifier>();
@@ -86,8 +94,8 @@ namespace OpenRA.Mods.Common.Traits
 		public void Attacking(Actor self, Target target)
 		{
 			state = AnimationState.Attacking;
-			if (DefaultAnimation.HasSequence(NormalizeInfantrySequence(self, info.AttackAnimation)))
-				DefaultAnimation.PlayThen(NormalizeInfantrySequence(self, info.AttackAnimation), () => state = AnimationState.Idle);
+			if (DefaultAnimation.HasSequence(NormalizeInfantrySequence(self, info.AttackSequence)))
+				DefaultAnimation.PlayThen(NormalizeInfantrySequence(self, info.AttackSequence), () => state = AnimationState.Idle);
 		}
 
 		public void Attacking(Actor self, Target target, Armament a, Barrel barrel)
@@ -95,10 +103,8 @@ namespace OpenRA.Mods.Common.Traits
 			Attacking(self, target);
 		}
 
-		public override void Tick(Actor self)
+		public virtual void Tick(Actor self)
 		{
-			base.Tick(self);
-
 			if (rsm != null)
 			{
 				if (wasModifying != rsm.IsModifyingSequence)
@@ -110,12 +116,12 @@ namespace OpenRA.Mods.Common.Traits
 			if ((state == AnimationState.Moving || dirty) && !move.IsMoving)
 			{
 				state = AnimationState.Waiting;
-				DefaultAnimation.PlayFetchIndex(NormalizeInfantrySequence(self, info.StandAnimations.Random(Game.CosmeticRandom)), () => 0);
+				DefaultAnimation.PlayFetchIndex(NormalizeInfantrySequence(self, info.StandSequences.Random(Game.CosmeticRandom)), () => 0);
 			}
 			else if ((state != AnimationState.Moving || dirty) && move.IsMoving)
 			{
 				state = AnimationState.Moving;
-				DefaultAnimation.PlayRepeating(NormalizeInfantrySequence(self, info.MoveAnimation));
+				DefaultAnimation.PlayRepeating(NormalizeInfantrySequence(self, info.MoveSequence));
 			}
 
 			dirty = false;
@@ -125,12 +131,12 @@ namespace OpenRA.Mods.Common.Traits
 		{
 			if (state != AnimationState.Idle && state != AnimationState.IdleAnimating)
 			{
-				DefaultAnimation.PlayFetchIndex(NormalizeInfantrySequence(self, info.StandAnimations.Random(Game.CosmeticRandom)), () => 0);
+				DefaultAnimation.PlayFetchIndex(NormalizeInfantrySequence(self, info.StandSequences.Random(Game.CosmeticRandom)), () => 0);
 				state = AnimationState.Idle;
 
-				if (info.IdleAnimations.Length > 0)
+				if (info.IdleSequences.Length > 0)
 				{
-					idleSequence = info.IdleAnimations.Random(self.World.SharedRandom);
+					idleSequence = info.IdleSequences.Random(self.World.SharedRandom);
 					idleDelay = self.World.SharedRandom.Next(info.MinIdleWaitTicks, info.MaxIdleWaitTicks);
 				}
 			}
@@ -143,14 +149,14 @@ namespace OpenRA.Mods.Common.Traits
 						state = AnimationState.IdleAnimating;
 						DefaultAnimation.PlayThen(idleSequence, () =>
 						{
-							DefaultAnimation.PlayRepeating(NormalizeInfantrySequence(self, info.StandAnimations.Random(Game.CosmeticRandom)));
+							DefaultAnimation.PlayRepeating(NormalizeInfantrySequence(self, info.StandSequences.Random(Game.CosmeticRandom)));
 							state = AnimationState.Waiting;
 						});
 					}
 				}
 				else
 				{
-					DefaultAnimation.PlayRepeating(NormalizeInfantrySequence(self, info.StandAnimations.Random(Game.CosmeticRandom)));
+					DefaultAnimation.PlayRepeating(NormalizeInfantrySequence(self, info.StandSequences.Random(Game.CosmeticRandom)));
 					state = AnimationState.Waiting;
 				}
 			}

OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs

@@ -719,6 +719,61 @@ namespace OpenRA.Mods.Common.UtilityCommands
 					}
 				}
 
+				if (engineVersion < 20150321)
+				{
+					// Note: These rules are set up to do approximately the right thing for maps, but
+					// mods need additional manual tweaks. This is the best we can do without having
+					// much smarter rules parsing, because we currently can't reason about inherited traits.
+					if (depth == 0)
+					{
+						var childKeys = new[] { "MinIdleWaitTicks", "MaxIdleWaitTicks", "MoveAnimation", "AttackAnimation", "IdleAnimations", "StandAnimations" };
+
+						var ri = node.Value.Nodes.FirstOrDefault(n => n.Key.StartsWith("RenderInfantry"));
+						if (ri != null)
+						{
+							ri.Key = "WithInfantryBody";
+
+							var rsNodes = ri.Value.Nodes.Where(n => !childKeys.Contains(n.Key)).ToList();
+							if (rsNodes.Any())
+								node.Value.Nodes.Add(new MiniYamlNode("RenderSprites", new MiniYaml("", rsNodes)));
+
+							ri.Value.Nodes.RemoveAll(n => rsNodes.Contains(n));
+						}
+
+						var rri = node.Value.Nodes.FirstOrDefault(n => n.Key.StartsWith("-RenderInfantry"));
+						if (rri != null)
+							rri.Key = "-WithInfantryBody";
+
+						var rdi = node.Value.Nodes.FirstOrDefault(n => n.Key.StartsWith("RenderDisguise"));
+						if (rdi != null)
+						{
+							rdi.Key = "WithDisguisingInfantryBody";
+
+							var rsNodes = rdi.Value.Nodes.Where(n => !childKeys.Contains(n.Key)).ToList();
+							if (rsNodes.Any())
+								node.Value.Nodes.Add(new MiniYamlNode("RenderSprites", new MiniYaml("", rsNodes)));
+
+							rdi.Value.Nodes.RemoveAll(n => rsNodes.Contains(n));
+						}
+
+						var rrdi = node.Value.Nodes.FirstOrDefault(n => n.Key.StartsWith("-RenderDisguise"));
+						if (rrdi != null)
+							rrdi.Key = "-WithDisguisingInfantryBody";
+					}
+
+					if (depth == 2 && node.Key == "MoveAnimation")
+						node.Key = "MoveSequence";
+
+					if (depth == 2 && node.Key == "AttackAnimation")
+						node.Key = "AttackSequence";
+
+					if (depth == 2 && node.Key == "IdleAnimations")
+						node.Key = "IdleSequences";
+
+					if (depth == 2 && node.Key == "StandAnimations")
+						node.Key = "StandSequences";
+				}
+
 				UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1);
 			}
 		}

OpenRA.Mods.RA/Activities/Leap.cs

@@ -45,7 +45,8 @@ namespace OpenRA.Mods.RA.Activities
 			to = self.World.Map.CenterOfSubCell(targetMobile.FromCell, targetMobile.FromSubCell);
 			length = Math.Max((to - from).Length / speed.Range, 1);
 
-			self.Trait<RenderInfantry>().Attacking(self, Target.FromActor(target));
+			// HACK: why isn't this using the interface?
+			self.Trait<WithInfantryBody>().Attacking(self, Target.FromActor(target));
 
 			if (weapon.Report != null && weapon.Report.Any())
 				Sound.Play(weapon.Report.Random(self.World.SharedRandom), self.CenterPosition);

OpenRA.Mods.RA/OpenRA.Mods.RA.csproj

@@ -94,7 +94,6 @@
     <Compile Include="Traits\PaletteEffects\ChronoshiftPaletteEffect.cs" />
     <Compile Include="Traits\PortableChrono.cs" />
     <Compile Include="Traits\Render\RenderJammerCircle.cs" />
-    <Compile Include="Traits\Render\RenderDisguise.cs" />
     <Compile Include="Traits\Render\RenderLandingCraft.cs" />
     <Compile Include="Traits\Render\RenderShroudCircle.cs" />
     <Compile Include="Traits\Render\RenderUnitReload.cs" />
@@ -106,6 +105,7 @@
     <Compile Include="Scripting\Properties\ChronosphereProperties.cs" />
     <Compile Include="Scripting\Properties\ParadropProperties.cs" />
     <Compile Include="Scripting\Properties\ParatroopersProperties.cs" />
+    <Compile Include="Traits\Render\WithDisguisingInfantryBody.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">

OpenRA.Mods.RA/Traits/Render/WithDisguisingInfantryBody.cs

@@ -13,21 +13,23 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Traits
 {
-	class RenderDisguiseInfo : RenderInfantryInfo, Requires<DisguiseInfo>
+	class WithDisguisingInfantryBodyInfo : WithInfantryBodyInfo, Requires<DisguiseInfo>
 	{
-		public override object Create(ActorInitializer init) { return new RenderDisguise(init, this); }
+		public override object Create(ActorInitializer init) { return new WithDisguisingInfantryBody(init, this); }
 	}
 
-	class RenderDisguise : RenderInfantry
+	class WithDisguisingInfantryBody : WithInfantryBody
 	{
-		RenderDisguiseInfo info;
+		readonly WithDisguisingInfantryBodyInfo info;
+		readonly Disguise disguise;
+		readonly RenderSprites rs;
 		string intendedSprite;
-		Disguise disguise;
 
-		public RenderDisguise(ActorInitializer init, RenderDisguiseInfo info)
+		public WithDisguisingInfantryBody(ActorInitializer init, WithDisguisingInfantryBodyInfo info)
 			: base(init, info)
 		{
 			this.info = info;
+			rs = init.Self.Trait<RenderSprites>();
 			disguise = init.Self.Trait<Disguise>();
 			intendedSprite = disguise.AsSprite;
 		}
@@ -37,8 +39,8 @@ namespace OpenRA.Mods.RA.Traits
 			if (disguise.AsSprite != intendedSprite)
 			{
 				intendedSprite = disguise.AsSprite;
-				DefaultAnimation.ChangeImage(intendedSprite ?? GetImage(self), info.StandAnimations.Random(Game.CosmeticRandom));
-				UpdatePalette();
+				DefaultAnimation.ChangeImage(intendedSprite ?? rs.GetImage(self), info.StandSequences.Random(Game.CosmeticRandom));
+				rs.UpdatePalette();
 			}
 
 			base.Tick(self);

mods/cnc/rules/defaults.yaml

@@ -182,7 +182,8 @@
 		TargetTypes: Ground, Infantry
 	TakeCover:
 		SpeedModifier: 60
-	RenderInfantry:
+	RenderSprites:
+	WithInfantryBody:
 	WithDeathAnimation:
 	AttackMove:
 	Passenger:
@@ -300,8 +301,7 @@
 		TargetTypes: Ground, Infantry
 	HiddenUnderFog:
 	GivesExperience:
-	RenderInfantry:
-		Palette: terrain
+	WithInfantryBody:
 	WithDeathAnimation:
 		UseDeathTypeSuffix: false
 	EditorAppearance:
@@ -316,6 +316,8 @@
 	Huntable:
 	ScriptTriggers:
 	DeathSounds:
+	RenderSprites:
+		Palette: terrain
 
 ^Plane:
 	AppearsOnRadar:

mods/cnc/rules/infantry.yaml

@@ -17,9 +17,9 @@ E1:
 	Armament:
 		Weapon: M16
 	AttackFrontal:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2,idle3,idle4
-		StandAnimations: stand, stand2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2,idle3,idle4
+		StandSequences: stand, stand2
 
 E2:
 	Inherits: ^Infantry
@@ -43,9 +43,9 @@ E2:
 		LocalOffset: 0,0,427
 		FireDelay: 15
 	AttackFrontal:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
-		StandAnimations: stand, stand2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
+		StandSequences: stand, stand2
 	Explodes:
 		Weapon: GrenadierExplode
 		EmptyWeapon: GrenadierExplode
@@ -74,9 +74,9 @@ E3:
 		LocalOffset: 256,43,341
 		FireDelay: 5
 	AttackFrontal:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
-		StandAnimations: stand, stand2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
+		StandSequences: stand, stand2
 
 E4:
 	Inherits: ^Infantry
@@ -104,9 +104,9 @@ E4:
 	AttackFrontal:
 	WithMuzzleFlash:
 		SplitFacings: true
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
-		StandAnimations: stand, stand2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
+		StandSequences: stand, stand2
 
 E5:
 	Inherits: ^Infantry
@@ -140,9 +140,9 @@ E5:
 	WithMuzzleFlash:
 		SplitFacings: true
 	-PoisonedByTiberium:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
-		StandAnimations: stand, stand2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
+		StandSequences: stand, stand2
 
 E6:
 	Inherits: ^Infantry
@@ -167,9 +167,9 @@ E6:
 	Captures:
 		CaptureTypes: building, husk
 	-AutoTarget:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
-		StandAnimations: stand, stand2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
+		StandSequences: stand, stand2
 	-GainsExperience:
 
 RMBO:
@@ -201,9 +201,9 @@ RMBO:
 	Armament:
 		Weapon: Sniper
 	AttackFrontal:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2,idle3
-		StandAnimations: stand, stand2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2,idle3
+		StandSequences: stand, stand2
 	AnnounceOnBuild:
 	AnnounceOnKill:
 

mods/d2k/rules/defaults.yaml

@@ -193,7 +193,8 @@
 		Voice: InfantryVoice
 	TargetableUnit:
 		TargetTypes: Ground
-	RenderInfantry:
+	RenderSprites:
+	WithInfantryBody:
 	TakeCover:
 	WithDeathAnimation:
 	AutoTarget:

mods/d2k/rules/infantry.yaml

@@ -99,8 +99,8 @@ medic:
 	AttackMedic:
 		Cursor: ability
 		OutsideRangeCursor: ability
-	RenderInfantry:
-		AttackAnimation: heal
+	WithInfantryBody:
+		AttackSequence: heal
 	Passenger:
 		PipType: Blue
 	-AutoTarget:
@@ -166,8 +166,8 @@ grenadier:
 		FireDelay: 15
 	AttackFrontal:
 	TakeCover:
-	RenderInfantry:
-		IdleAnimations: idle
+	WithInfantryBody:
+		IdleSequences: idle
 	Explodes:
 		Weapon: UnitExplodeSmall
 		Chance: 100
@@ -228,3 +228,4 @@ saboteur:
 	-AutoTarget:
 	AttractsWorms:
 		Intensity: 120
+

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

@@ -1381,14 +1381,14 @@ Rules:
 		-ExternalCaptures:
 		Captures:
 			CaptureTypes: building
-		RenderInfantry:
-			Image: E6
 		Cloak@JAIL:
 			UpgradeTypes: jail
 			UpgradeMinEnabledLevel: 1
 			InitialDelay: 0
 			CloakDelay: 0
 			Palette:
+		RenderSprites:
+			Image: E6
 	MEDI:
 		Cloak@JAIL:
 			UpgradeTypes: jail
@@ -1398,11 +1398,11 @@ Rules:
 			Palette:
 	E7.noautotarget:
 		Inherits: E7
-		RenderInfantry:
-			Image: E7
 		AutoTarget:
 			EnableStances: false
 		-AttackMove:
+		RenderSprites:
+			Image: E7
 	PRISON:
 		Immobile:
 			OccupiesSpace: false
@@ -1430,7 +1430,7 @@ Rules:
 			Range: 8c0
 		AutoTarget:
 			ScanRadius: 7
-		RenderInfantry:
+		RenderSprites:
 			Image: E1
 	E2.Autotarget:
 		Inherits: E2
@@ -1440,7 +1440,7 @@ Rules:
 			Range: 8c0
 		AutoTarget:
 			ScanRadius: 7
-		RenderInfantry:
+		RenderSprites:
 			Image: E2
 	DOG:
 		RevealsShroud:

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

@@ -1276,14 +1276,15 @@ Rules:
 		-ExternalCaptures:
 		Captures:
 			CaptureTypes: building
-		RenderInfantry:
-			Image: E6
+		WithInfantryBody:
 		Cloak@JAIL:
 			UpgradeTypes: jail
 			UpgradeMinEnabledLevel: 1
 			InitialDelay: 0
 			CloakDelay: 0
 			Palette:
+		RenderSprites:
+			Image: E6
 	MEDI:
 		Cloak@JAIL:
 			UpgradeTypes: jail
@@ -1293,11 +1294,11 @@ Rules:
 			Palette:
 	E7.noautotarget:
 		Inherits: E7
-		RenderInfantry:
-			Image: E7
 		AutoTarget:
 			EnableStances: false
 		-AttackMove:
+		RenderSprites:
+			Image: E7
 	PRISON:
 		Immobile:
 			OccupiesSpace: false
@@ -1338,7 +1339,7 @@ Rules:
 			Range: 8c0
 		AutoTarget:
 			ScanRadius: 7
-		RenderInfantry:
+		RenderSprites:
 			Image: E1
 	E2.Autotarget:
 		Inherits: E2
@@ -1348,7 +1349,7 @@ Rules:
 			Range: 8c0
 		AutoTarget:
 			ScanRadius: 7
-		RenderInfantry:
+		RenderSprites:
 			Image: E2
 	DOG:
 		Buildable:

mods/ra/maps/allies-05a/map.yaml

@@ -1687,11 +1687,11 @@ Rules:
 			TargetTypes: Ground, C4, DetonateAttack, Structure, Mission Objectives
 	E7.noautotarget:
 		Inherits: E7
-		RenderInfantry:
-			Image: E7
 		AutoTarget:
 			EnableStances: false
 		-AttackMove:
+		RenderSprites:
+			Image: E7
 	Colt:
 		-Huntable:
 		AutoTargetIgnore:
@@ -1727,7 +1727,7 @@ Rules:
 			Range: 8c0
 		AutoTarget:
 			ScanRadius: 7
-		RenderInfantry:
+		RenderSprites:
 			Image: E1
 	E2.Autotarget:
 		Inherits: E2
@@ -1737,7 +1737,7 @@ Rules:
 			Range: 8c0
 		AutoTarget:
 			ScanRadius: 7
-		RenderInfantry:
+		RenderSprites:
 			Image: E2
 	AFLD:
 		AirstrikePower@spyplane:

mods/ra/maps/fort-lonestar/map.yaml

@@ -617,12 +617,12 @@ Rules:
 		Inherits: SNIPER
 		Buildable:
 			Prerequisites: ~disabled
-		RenderInfantry:
-			Image: SNIPER
 		MustBeDestroyed:
 		InvulnerabilityUpgrade@UNKILLABLE:
 			UpgradeTypes: unkillable
 			UpgradeMinEnabledLevel: 1
+		RenderSprites:
+			Image: SNIPER
 	SPY:
 		Inherits: ^Infantry
 		Buildable:

mods/ra/maps/intervention/map.yaml

@@ -2240,7 +2240,7 @@ Rules:
 		Captures:
 			CaptureTypes: building
 			Sabotage: False
-		RenderInfantry:
+		RenderSprites:
 			Image: e6
 	E6:
 		Buildable:

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

@@ -2145,10 +2145,10 @@ Rules:
 		Inherits: DELPHI
 		Tooltip:
 			Name: Dr. Demitri
-		RenderInfantry:
-			Image: DELPHI
 		Passenger:
 			CargoType: Demitri
+		RenderSprites:
+			Image: DELPHI
 	TRAN:
 		RevealsShroud:
 			Range: 0c0

mods/ra/rules/civilian.yaml

@@ -13,43 +13,50 @@ C4:
 	Inherits: ^CivInfantry
 	Selectable:
 		Voice: CivilianFemaleVoice
-	RenderInfantry:
+	WithInfantryBody:
+	RenderSprites:
 		Image: C2
 
 C5:
 	Inherits: ^CivInfantry
-	RenderInfantry:
+	WithInfantryBody:
+	RenderSprites:
 		Image: C1
 
 C6:
 	Inherits: ^CivInfantry
 	Selectable:
 		Voice: CivilianFemaleVoice
-	RenderInfantry:
+	WithInfantryBody:
+	RenderSprites:
 		Image: C2
 
 C7:
 	Inherits: ^CivInfantry
-	RenderInfantry:
+	WithInfantryBody:
+	RenderSprites:
 		Image: C1
 
 C8:
 	Inherits: ^CivInfantry
 	Selectable:
 		Voice: CivilianFemaleVoice
-	RenderInfantry:
+	WithInfantryBody:
+	RenderSprites:
 		Image: C2
 
 C9:
 	Inherits: ^CivInfantry
-	RenderInfantry:
+	WithInfantryBody:
+	RenderSprites:
 		Image: C1
 
 C10:
 	Inherits: ^CivInfantry
 	Selectable:
 		Voice: CivilianFemaleVoice
-	RenderInfantry:
+	WithInfantryBody:
+	RenderSprites:
 		Image: C2
 
 FCOM:

mods/ra/rules/defaults.yaml

@@ -186,7 +186,8 @@
 		Voice: GenericVoice
 	TargetableUnit:
 		TargetTypes: Ground, Infantry, Disguise
-	RenderInfantry:
+	RenderSprites:
+	WithInfantryBody:
 	WithDeathAnimation:
 	AutoTarget:
 	AttackMove:
@@ -557,7 +558,7 @@
 	AttackFrontal:
 	ProximityCaptor:
 		Types: CivilianInfantry
-	RenderInfantry:
+	WithInfantryBody:
 	ScaredyCat:
 
 ^CivBuilding:

mods/ra/rules/infantry.yaml

@@ -22,8 +22,8 @@ DOG:
 	Armament:
 		Weapon: DogJaw
 	AttackLeap:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
 	IgnoresDisguise:
 	DetectCloaked:
 		Range: 5
@@ -54,9 +54,9 @@ E1:
 		MuzzleSequence: garrison-muzzle
 	AttackFrontal:
 	TakeCover:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
-		StandAnimations: stand,stand2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
+		StandSequences: stand,stand2
 
 E2:
 	Inherits: ^Infantry
@@ -86,9 +86,9 @@ E2:
 		FireDelay: 15
 	AttackFrontal:
 	TakeCover:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
-		StandAnimations: stand,stand2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
+		StandSequences: stand,stand2
 	Explodes:
 		Weapon: UnitExplodeSmall
 		Chance: 50
@@ -122,9 +122,9 @@ E3:
 		Weapon: Dragon
 	AttackFrontal:
 	TakeCover:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
-		StandAnimations: stand,stand2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
+		StandSequences: stand,stand2
 
 E4:
 	Inherits: ^Infantry
@@ -153,9 +153,9 @@ E4:
 		Weapon: Flamer
 	AttackFrontal:
 	TakeCover:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
-		StandAnimations: stand,stand2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
+		StandSequences: stand,stand2
 
 E6:
 	Inherits: ^Infantry
@@ -184,9 +184,9 @@ E6:
 		Type: building
 	TakeCover:
 	-AutoTarget:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
-		StandAnimations: stand,stand2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
+		StandSequences: stand,stand2
 
 SPY:
 	Inherits: ^Infantry
@@ -218,24 +218,25 @@ SPY:
 	Infiltrates:
 		Types: SpyInfiltrate
 	-AutoTarget:
-	-RenderInfantry:
-	RenderDisguise:
-		IdleAnimations: idle1,idle2
-		StandAnimations: stand,stand2
+	-WithInfantryBody:
+	WithDisguisingInfantryBody:
+		IdleSequences: idle1,idle2
+		StandSequences: stand,stand2
 	Armament:
 		Weapon: SilencedPPK
 	AttackFrontal:
 
 SPY.England:
 	Inherits: SPY
-	RenderDisguise:
-		Image: spy
+	WithDisguisingInfantryBody:
 	Buildable:
 		Prerequisites: ~infantry.england, dome, ~tent, ~techlevel.medium
 	Valued:
 		Cost: 250
 	DisguiseToolTip:
 		Name: British Spy
+	RenderSprites:
+		Image: spy
 
 E7:
 	Inherits: ^Infantry
@@ -274,8 +275,8 @@ E7:
 		MuzzleSequence: garrison-muzzle
 	AttackFrontal:
 	TakeCover:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
 	AnnounceOnBuild:
 	AnnounceOnKill:
 
@@ -310,9 +311,9 @@ MEDI:
 		OutsideRangeCursor: heal
 	TakeCover:
 	-AutoTarget:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
-		AttackAnimation: heal
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
+		AttackSequence: heal
 
 MECH:
 	Inherits: ^Infantry
@@ -347,9 +348,9 @@ MECH:
 		CaptureTypes: husk
 	TakeCover:
 	-AutoTarget:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
-		AttackAnimation: heal
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
+		AttackSequence: heal
 
 EINSTEIN:
 	Inherits: ^Infantry
@@ -369,7 +370,7 @@ EINSTEIN:
 	-AutoTarget:
 	ProximityCaptor:
 		Types: CivilianInfantry
-	RenderInfantry:
+	WithInfantryBody:
 	ScaredyCat:
 
 DELPHI:
@@ -390,7 +391,7 @@ DELPHI:
 	-AutoTarget:
 	ProximityCaptor:
 		Types: CivilianInfantry
-	RenderInfantry:
+	WithInfantryBody:
 	ScaredyCat:
 
 CHAN:
@@ -484,9 +485,9 @@ SHOK:
 		Weapon: PortaTesla
 	AttackFrontal:
 	TakeCover:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
-		StandAnimations: stand,stand2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
+		StandSequences: stand,stand2
 
 SNIPER:
 	Inherits: ^Infantry
@@ -520,9 +521,9 @@ SNIPER:
 		MuzzleSequence: garrison-muzzle
 	AttackFrontal:
 	TakeCover:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
-		StandAnimations: stand,stand2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
+		StandSequences: stand,stand2
 	Cloak:
 		InitialDelay: 250
 		CloakDelay: 120

mods/ts/rules/defaults.yaml

@@ -166,7 +166,8 @@
 		Voice: Infantry
 	TargetableUnit:
 		TargetTypes: Ground, Infantry
-	RenderInfantry:
+	RenderSprites:
+	WithInfantryBody:
 	WithDeathAnimation:
 	AutoTarget:
 	AttackMove:
@@ -248,7 +249,7 @@
 	AttackFrontal:
 	ProximityCaptor:
 		Types: CivilianInfantry
-	RenderInfantry:
+	WithInfantryBody:
 	ScaredyCat:
 	-MustBeDestroyed:
 

mods/ts/rules/infantry.yaml

@@ -26,8 +26,8 @@ E1:
 		UpgradeMinEnabledLevel: 1
 	AttackFrontal:
 	TakeCover:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
 
 E2:
 	Inherits: ^Infantry
@@ -52,8 +52,8 @@ E2:
 		FireDelay: 5
 	AttackFrontal:
 	TakeCover:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
 
 E3:
 	Inherits: ^Infantry
@@ -78,8 +78,8 @@ E3:
 		LocalOffset: 128,0,640
 	AttackFrontal:
 	TakeCover:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
 
 WEEDGUY:
 	Inherits: ^Infantry
@@ -106,7 +106,7 @@ WEEDGUY:
 		Weapon: FireballLauncher
 		LocalOffset: 85,0,384
 	AttackFrontal:
-	RenderInfantry:
+	WithInfantryBody:
 	TakeCover:
 
 MEDIC:
@@ -133,9 +133,9 @@ MEDIC:
 		Weapon: Heal
 	AttackFrontal:
 	TakeCover:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
-		AttackAnimation: heal
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
+		AttackSequence: heal
 	SelfHealing:
 	Passenger:
 		PipType: Red
@@ -165,8 +165,8 @@ ENGINEER:
 	Captures:
 		CaptureTypes: building
 	-AutoTarget:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
 	TakeCover:
 	-GainsExperience:
 
@@ -197,8 +197,8 @@ UMAGON:
 		Weapon: Sniper
 	AttackFrontal:
 	TakeCover:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
 
 GHOST:
 	Inherits: ^Infantry
@@ -233,8 +233,8 @@ GHOST:
 	C4Demolition:
 		C4Delay: 45
 	TakeCover:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
 
 JUMPJET:
 	Inherits: ^Infantry
@@ -264,7 +264,7 @@ JUMPJET:
 	-Crushable:
 	AttackFrontal:
 	TakeCover:
-	RenderInfantry:
+	WithInfantryBody:
 
 CHAMSPY:
 	Inherits: ^Infantry
@@ -292,9 +292,9 @@ CHAMSPY:
 	Infiltrates:
 		Types: SpyInfiltrate
 	-AutoTarget:
-	-RenderInfantry:
-	RenderDisguise:
-		IdleAnimations: idle1,idle2
+	-WithInfantryBody:
+	WithDisguisingInfantryBody:
+		IdleSequences: idle1,idle2
 
 CYBORG:
 	Inherits: ^Infantry
@@ -326,8 +326,8 @@ CYBORG:
 		Weapon: Vulcan3
 	AttackFrontal:
 	TakeCover:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
 
 CYC2:
 	Inherits: ^Infantry
@@ -360,8 +360,8 @@ CYC2:
 		LocalOffset: 170,85,683
 	AttackFrontal:
 	TakeCover:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
 
 MUTANT:
 	Inherits: ^Infantry
@@ -388,8 +388,8 @@ MUTANT:
 		Weapon: Vulcan
 	AttackFrontal:
 	TakeCover:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
 
 MWMN:
 	Inherits: ^Infantry
@@ -416,8 +416,8 @@ MWMN:
 		Weapon: Vulcan
 	AttackFrontal:
 	TakeCover:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
 
 MUTANT3:
 	Inherits: ^Infantry
@@ -444,8 +444,8 @@ MUTANT3:
 		Weapon: Vulcan
 	AttackFrontal:
 	TakeCover:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
 
 MHIJACK:
 	Inherits: ^Infantry
@@ -471,8 +471,8 @@ MHIJACK:
 		Range: 6c0
 	-AutoTarget:
 	TakeCover:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
 
 TRATOS:
 	Inherits: ^Infantry
@@ -496,8 +496,8 @@ TRATOS:
 		Range: 4c0
 	TakeCover:
 	-AutoTarget:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
 
 OXANNA:
 	Inherits: ^Infantry
@@ -519,8 +519,8 @@ OXANNA:
 		Range: 4c0
 	TakeCover:
 	-AutoTarget:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
 
 SLAV:
 	Inherits: ^Infantry
@@ -542,8 +542,8 @@ SLAV:
 		Range: 4c0
 	TakeCover:
 	-AutoTarget:
-	RenderInfantry:
-		IdleAnimations: idle1,idle2
+	WithInfantryBody:
+		IdleSequences: idle1,idle2
 
 DOGGIE:
 	Inherits: ^Infantry
@@ -603,9 +603,10 @@ VISSML:
 	TargetableUnit:
 		TargetTypes: Ground
 	-AutoTarget:
-	-RenderInfantry:
-	RenderUnit:
+	-RenderSprites:
+	-WithInfantryBody:
 	-WithDeathAnimation:
+	RenderUnit:
 
 VISLRG:
 	Inherits: ^Infantry
@@ -639,9 +640,10 @@ VISLRG:
 		WanderMoveRadius: 2
 		MinMoveDelayInTicks: 25
 		MaxMoveDelayInTicks: 45
-	-RenderInfantry:
-	RenderUnit:
+	-RenderSprites:
+	-WithInfantryBody:
 	-WithDeathAnimation:
+	RenderUnit:
 
 CIV1:
 	Inherits: ^CivilianInfantry

mods/ts/rules/misc.yaml

@@ -16,13 +16,14 @@ waypoint:
 		InitialFacing: 160
 	Turreted:
 		InitialFacing: 160
-	RenderInfantry:
-		Image: mmch
-		StandAnimations: run
-		Palette: colorpicker
+	WithInfantryBody:
+		StandSequences: run
 	RenderVoxels:
 		Image: mmch
 		Palette: colorpicker
+	RenderSprites:
+		Image: mmch
+		Palette: colorpicker
 
 CAMERA:
 	Immobile:
@@ -66,3 +67,4 @@ TROCK04:
 
 TROCK05:
 	Inherits: ^Rock
+

mods/ts/rules/vehicles.yaml

@@ -518,7 +518,8 @@ MMCH:
 		Type: Heavy
 	RevealsShroud:
 		Range: 8c0
-	RenderInfantry:
+	RenderSprites:
+	WithInfantryBody:
 	Turreted:
 		ROT: 5
 	AttackTurreted:
@@ -590,7 +591,8 @@ SMECH:
 	AutoTarget:
 	Armament:
 		Weapon: AssaultCannon
-	RenderInfantry:
+	RenderSprites:
+	WithInfantryBody:
 	Selectable:
 		Voices: Mech
 		Bounds: 16, 32