epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check for missing sequence entries using lint

Browse Source
This commit is contained in:
Matthias Mailänder
2015-05-24 14:24:09 +02:00
parent 7424f32b2f
commit 7faebe874a
59 changed files with 273 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Game/Traits/LintAttributes.cs
View File

@@ -25,4 +25,16 @@ namespace OpenRA.Traits
[AttributeUsage(AttributeTargets.Field)]
public sealed class VoiceReferenceAttribute : Attribute { }
[AttributeUsage(AttributeTargets.Field)]
public sealed class SequenceReferenceAttribute : Attribute
{
public readonly string ImageReference; // the field name in the same trait info that contains the image name
public readonly bool Prefix;
public SequenceReferenceAttribute(string imageReference = null, bool prefix = false)
{
ImageReference = imageReference;
Prefix = prefix;
}
}
}

3
OpenRA.Mods.Common/Effects/Bullet.cs
View File

@@ -27,6 +27,7 @@ namespace OpenRA.Mods.Common.Effects
[Desc("Maximum offset at the maximum range.")]
public readonly WRange Inaccuracy = WRange.Zero;
public readonly string Image = null;
[SequenceReference("Image")] public readonly string Sequence = "idle";
public readonly string Palette = "effect";
public readonly bool Shadow = false;
[Desc("Trail animation.")]
@@ -138,7 +139,7 @@ namespace OpenRA.Mods.Common.Effects
if (!string.IsNullOrEmpty(info.Trail) && --smokeTicks < 0)
{
var delayedPos = WPos.LerpQuadratic(args.Source, target, angle, ticks - info.TrailDelay, length);
world.AddFrameEndTask(w => w.Add(new Smoke(w, delayedPos, info.Trail, trailPalette)));
world.AddFrameEndTask(w => w.Add(new Smoke(w, delayedPos, info.Trail, trailPalette, info.Sequence)));
smokeTicks = info.TrailInterval;
}

3
OpenRA.Mods.Common/Effects/Missile.cs
View File

@@ -23,6 +23,7 @@ namespace OpenRA.Mods.Common.Effects
class MissileInfo : IProjectileInfo
{
public readonly string Image = null;
[SequenceReference("Image")] public readonly string Sequence = "idle";
public readonly string Palette = "effect";
public readonly bool Shadow = false;
[Desc("Projectile speed in WRange / tick")]
@@ -171,7 +172,7 @@ namespace OpenRA.Mods.Common.Effects
if (!string.IsNullOrEmpty(info.Trail) && --ticksToNextSmoke < 0)
{
world.AddFrameEndTask(w => w.Add(new Smoke(w, pos - 3 * move / 2, info.Trail, trailPalette)));
world.AddFrameEndTask(w => w.Add(new Smoke(w, pos - 3 * move / 2, info.Trail, trailPalette, info.Sequence)));
ticksToNextSmoke = info.TrailInterval;
}

4
OpenRA.Mods.Common/Effects/Parachute.cs
View File

@@ -40,14 +40,14 @@ namespace OpenRA.Mods.Common.Effects
if (parachuteSprite != null)
{
parachute = new Animation(cargo.World, parachuteSprite);
parachute.PlayThen("open", () => parachute.PlayRepeating("idle"));
parachute.PlayThen(parachutableInfo.ParachuteOpenSequence, () => parachute.PlayRepeating(parachutableInfo.ParachuteIdleSequence));
}
var shadowSprite = parachutableInfo != null ? parachutableInfo.ShadowSequence : null;
if (shadowSprite != null)
{
shadow = new Animation(cargo.World, shadowSprite);
shadow.PlayRepeating("idle");
shadow.PlayRepeating(parachutableInfo.ParachuteIdleSequence);
}
if (parachutableInfo != null)

4
OpenRA.Mods.Common/Effects/Smoke.cs
View File

@@ -21,14 +21,14 @@ namespace OpenRA.Mods.Common.Effects
readonly Animation anim;
readonly string palette;
public Smoke(World world, WPos pos, string trail, string palette)
public Smoke(World world, WPos pos, string trail, string palette, string sequence)
{
this.world = world;
this.pos = pos;
this.palette = palette;
anim = new Animation(world, trail);
anim.PlayThen("idle",
anim.PlayThen(sequence,
() => world.AddFrameEndTask(w => w.Remove(this)));
}

79
OpenRA.Mods.Common/Lint/CheckSequences.cs
View File

@@ -9,7 +9,9 @@
#endregion
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
@@ -17,9 +19,17 @@ namespace OpenRA.Mods.Common.Lint
{
class CheckSequences : ILintPass
{
Action<string> emitWarning;
List<MiniYamlNode> sequenceDefinitions;
public void Run(Action<string> emitError, Action<string> emitWarning, Map map)
{
var sequences = MiniYaml.MergeLiberal(map.SequenceDefinitions, Game.ModData.Manifest.Sequences.Select(s => MiniYaml.FromFile(s)).Aggregate(MiniYaml.MergeLiberal));
this.emitWarning = emitWarning;
sequenceDefinitions = MiniYaml.MergeLiberal(map.SequenceDefinitions,
Game.ModData.Manifest.Sequences.Select(s => MiniYaml.FromFile(s)).Aggregate(MiniYaml.MergeLiberal));
var races = map.Rules.Actors["world"].Traits.WithInterface<CountryInfo>().Select(c => c.Race);
foreach (var actorInfo in map.Rules.Actors)
@@ -29,11 +39,76 @@ namespace OpenRA.Mods.Common.Lint
foreach (var race in races)
{
var image = renderInfo.GetImage(actorInfo.Value, map.Rules.Sequences[map.Tileset], race);
if (!sequences.Any(s => s.Key == image.ToLowerInvariant()) && !actorInfo.Value.Name.Contains("^"))
if (!sequenceDefinitions.Any(s => s.Key == image.ToLowerInvariant()) && !actorInfo.Value.Name.Contains("^"))
emitWarning("Sprite image {0} from actor {1} on tileset {2} using race {3} has no sequence definition."
.F(image, actorInfo.Value.Name, map.Tileset, race));
}
}
foreach (var traitInfo in actorInfo.Value.Traits.WithInterface<ITraitInfo>())
{
var fields = traitInfo.GetType().GetFields();
foreach (var field in fields)
{
if (field.HasAttribute<SequenceReferenceAttribute>())
{
var sequences = LintExts.GetFieldValues(traitInfo, field, emitError);
foreach (var sequence in sequences)
{
if (string.IsNullOrEmpty(sequence))
continue;
var renderInfo = actorInfo.Value.Traits.WithInterface<RenderSpritesInfo>().FirstOrDefault();
if (renderInfo == null)
continue;
foreach (var race in races)
{
var sequenceReference = field.GetCustomAttributes<SequenceReferenceAttribute>(true).FirstOrDefault();
if (sequenceReference != null && !string.IsNullOrEmpty(sequenceReference.ImageReference))
{
var imageField = fields.FirstOrDefault(f => f.Name == sequenceReference.ImageReference);
if (imageField != null)
{
foreach (var imageOverride in LintExts.GetFieldValues(traitInfo, imageField, emitError))
{
if (!string.IsNullOrEmpty(imageOverride) && !sequenceDefinitions.Any(s => s.Key == imageOverride.ToLowerInvariant()))
emitWarning("Custom sprite image {0} from actor {1} has no sequence definition.".F(imageOverride, actorInfo.Value.Name));
else
CheckDefintions(imageOverride, sequenceReference, actorInfo, sequence, race, field, traitInfo);
}
}
}
else
{
var image = renderInfo.GetImage(actorInfo.Value, map.SequenceProvider, race);
CheckDefintions(image, sequenceReference, actorInfo, sequence, race, field, traitInfo);
}
}
}
}
}
}
}
}
void CheckDefintions(string image, SequenceReferenceAttribute sequenceReference,
KeyValuePair<string, ActorInfo> actorInfo, string sequence, string race, FieldInfo field, ITraitInfo traitInfo)
{
var definitions = sequenceDefinitions.FirstOrDefault(n => n.Key == image.ToLowerInvariant());
if (definitions != null)
{
if (sequenceReference != null && sequenceReference.Prefix)
{
if (!definitions.Value.Nodes.Any(n => n.Key.StartsWith(sequence)))
emitWarning("Sprite image {0} from actor {1} of faction {2} does not define sequence prefix {3} from field {4} of {5}"
.F(image, actorInfo.Value.Name, race, sequence, field.Name, traitInfo));
}
else if (!definitions.Value.Nodes.Any(n => n.Key == sequence))
{
emitWarning("Sprite image {0} from actor {1} of faction {2} does not define sequence {3} from field {4} of {5}"
.F(image, actorInfo.Value.Name, race, sequence, field.Name, traitInfo));
}
}
}
}

4
OpenRA.Mods.Common/Traits/Infantry/ScaredyCat.cs
View File

@@ -24,6 +24,8 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Chance (out of 100) the unit has to enter panic mode when attacked.")]
public readonly int AttackPanicChance = 20;
[SequenceReference(null, true)] public readonly string PanicSequencePrefix = "panic-";
public object Create(ActorInitializer init) { return new ScaredyCat(init.Self, this); }
}
@@ -36,7 +38,7 @@ namespace OpenRA.Mods.Common.Traits
bool Panicking { get { return panicStartedTick > 0; } }
public bool IsModifyingSequence { get { return Panicking; } }
public string SequencePrefix { get { return "panic-"; } }
public string SequencePrefix { get { return info.PanicSequencePrefix; } }
public ScaredyCat(Actor self, ScaredyCatInfo info)
{

2
OpenRA.Mods.Common/Traits/Infantry/TakeCover.cs
View File

@@ -33,7 +33,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly WVec ProneOffset = new WVec(85, 0, -171);
public readonly string ProneSequencePrefix = "prone-";
[SequenceReference(null, true)] public readonly string ProneSequencePrefix = "prone-";
public override object Create(ActorInitializer init) { return new TakeCover(init, this); }

10
OpenRA.Mods.Common/Traits/Parachutable.cs
View File

@@ -19,16 +19,20 @@ namespace OpenRA.Mods.Common.Traits
[Desc("If we land on invalid terrain for my actor type should we be killed?")]
public readonly bool KilledOnImpassableTerrain = true;
[Desc("Group where Ground/WaterCorpseSequence is looked up.")]
public readonly string CorpseSequenceCollection = "explosion";
public readonly string GroundImpactSound = null;
public readonly string GroundCorpseSequence = "corpse";
[SequenceReference("CorpseSequenceCollection")] public readonly string GroundCorpseSequence = "corpse";
public readonly string GroundCorpsePalette = "effect";
public readonly string WaterImpactSound = null;
public readonly string WaterCorpseSequence = "small_splash";
[SequenceReference("CorpseSequenceCollection")] public readonly string WaterCorpseSequence = null;
public readonly string WaterCorpsePalette = "effect";
[Desc("Requires the sub-sequences \"open\" and \"idle\".")]
public readonly string ParachuteSequence = null;
[SequenceReference("ParachuteSequence")] public readonly string ParachuteOpenSequence = null;
[SequenceReference("ParachuteSequence")] public readonly string ParachuteIdleSequence = null;
[Desc("Optional, otherwise defaults to the palette the actor is using.")]
public readonly string ParachutePalette = null;

2
OpenRA.Mods.Common/Traits/Render/RenderBuildingCharge.cs
View File

@@ -16,7 +16,7 @@ namespace OpenRA.Mods.Common.Traits
public class RenderBuildingChargeInfo : RenderBuildingInfo
{
[Desc("Sequence to use for building charge animation.")]
public readonly string ChargeSequence = "active";
[SequenceReference] public readonly string ChargeSequence = "active";
public override object Create(ActorInitializer init) { return new RenderBuildingCharge(init, this); }
}

2
OpenRA.Mods.Common/Traits/Render/RenderHarvester.cs
View File

@@ -18,7 +18,7 @@ namespace OpenRA.Mods.Common.Traits
{
public readonly string[] ImagesByFullness = { "harv" };
public readonly string HarvestSequence = "harvest";
[SequenceReference("ImagesByFullness")] public readonly string HarvestSequence = "harvest";
public override object Create(ActorInitializer init) { return new RenderHarvester(init, this); }
}

2
OpenRA.Mods.Common/Traits/Render/RenderSimple.cs
View File

@@ -19,7 +19,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Basic render trait for immobile actors. Deprecated, use RenderSprites + WithSpriteBody instead.")]
public class RenderSimpleInfo : RenderSpritesInfo, IRenderActorPreviewSpritesInfo, IQuantizeBodyOrientationInfo, Requires<IBodyOrientationInfo>
{
public readonly string Sequence = "idle";
[SequenceReference] public readonly string Sequence = "idle";
public override object Create(ActorInitializer init) { return new RenderSimple(init, this); }

2
OpenRA.Mods.Common/Traits/Render/RenderSprites.cs
View File

@@ -82,7 +82,7 @@ namespace OpenRA.Mods.Common.Traits
public string GetImage(ActorInfo actor, SequenceProvider sequenceProvider, string race)
{
if (RaceImages != null)
if (RaceImages != null && !string.IsNullOrEmpty(race))
{
string raceImage = null;
if (RaceImages.TryGetValue(race, out raceImage) && sequenceProvider.HasSequence(raceImage))

2
OpenRA.Mods.Common/Traits/Render/WithActiveAnimation.cs
View File

@@ -19,7 +19,7 @@ namespace OpenRA.Mods.Common.Traits
public class WithActiveAnimationInfo : ITraitInfo, Requires<RenderBuildingInfo>
{
[Desc("Sequence name to use")]
public readonly string Sequence = "active";
[SequenceReference] public readonly string Sequence = "active";
public readonly int Interval = 750;

6
OpenRA.Mods.Common/Traits/Render/WithAttackAnimation.cs
View File

@@ -20,13 +20,13 @@ namespace OpenRA.Mods.RA.Traits
public readonly string Armament = "primary";
[Desc("Displayed while attacking.")]
public readonly string AttackSequence = null;
[SequenceReference] public readonly string AttackSequence = null;
[Desc("Displayed while targeting.")]
public readonly string AimSequence = null;
[SequenceReference] public readonly string AimSequence = null;
[Desc("Shown while reloading.")]
public readonly string ReloadPrefix = null;
[SequenceReference(null, true)] public readonly string ReloadPrefix = null;
public object Create(ActorInitializer init) { return new WithAttackAnimation(init, this); }
}

2
OpenRA.Mods.Common/Traits/Render/WithBarrel.cs
View File

@@ -20,7 +20,7 @@ namespace OpenRA.Mods.Common.Traits
class WithBarrelInfo : ITraitInfo, IRenderActorPreviewSpritesInfo, Requires<RenderSpritesInfo>, Requires<IBodyOrientationInfo>
{
[Desc("Sequence name to use")]
public readonly string Sequence = "barrel";
[SequenceReference] public readonly string Sequence = "barrel";
[Desc("Armament to use for recoil")]
public readonly string Armament = "primary";

5
OpenRA.Mods.Common/Traits/Render/WithBuildingExplosion.cs
View File

@@ -18,8 +18,11 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Display explosions over the building footprint when it is destroyed.")]
class WithBuildingExplosionInfo : ITraitInfo, Requires<BuildingInfo>
{
[Desc("Group where Sequence is looked up.")]
public readonly string SequenceCollection = "explosion";
[Desc("Explosion sequence name to use")]
public readonly string Sequence = "building";
[SequenceReference("SequenceCollection")] public readonly string Sequence = "building";
[Desc("Delay the explosions by this many ticks.")]
public readonly int Delay = 0;

2
OpenRA.Mods.Common/Traits/Render/WithBuildingPlacedAnimation.cs
View File

@@ -16,7 +16,7 @@ namespace OpenRA.Mods.Common.Traits
public class WithBuildingPlacedAnimationInfo : ITraitInfo, Requires<RenderSimpleInfo>
{
[Desc("Sequence name to use")]
public readonly string Sequence = "build";
[SequenceReference] public readonly string Sequence = "build";
public object Create(ActorInitializer init) { return new WithBuildingPlacedAnimation(init.Self, this); }
}

2
OpenRA.Mods.Common/Traits/Render/WithBuildingPlacedOverlay.cs
View File

@@ -17,7 +17,7 @@ namespace OpenRA.Mods.Common.Traits
public class WithBuildingPlacedOverlayInfo : ITraitInfo, Requires<RenderSpritesInfo>, Requires<IBodyOrientationInfo>
{
[Desc("Sequence name to use")]
public readonly string Sequence = "crane-overlay";
[SequenceReference] public readonly string Sequence = "crane-overlay";
[Desc("Position relative to body")]
public readonly WVec Offset = WVec.Zero;

2
OpenRA.Mods.Common/Traits/Render/WithChargeOverlay.cs
View File

@@ -17,7 +17,7 @@ namespace OpenRA.Mods.Common.Traits
public class WithChargeOverlayInfo : ITraitInfo, Requires<RenderSpritesInfo>
{
[Desc("Sequence name to use")]
public readonly string Sequence = "active";
[SequenceReference] public readonly string Sequence = "active";
[Desc("Custom palette name")]
public readonly string Palette = null;

17
OpenRA.Mods.Common/Traits/Render/WithCrateBody.cs
View File

@@ -23,12 +23,16 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Easteregg sequences to use in december.")]
public readonly string[] XmasImages = { };
[SequenceReference] public readonly string IdleSequence = "idle";
public readonly string WaterSequence = null;
public readonly string LandSequence = null;
public object Create(ActorInitializer init) { return new WithCrateBody(init.Self, this); }
public IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
{
var anim = new Animation(init.World, rs.Image, () => 0);
anim.PlayRepeating(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), "idle"));
anim.PlayRepeating(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), IdleSequence));
yield return new SpriteActorPreview(anim, WVec.Zero, 0, p, rs.Scale);
}
@@ -39,22 +43,27 @@ namespace OpenRA.Mods.Common.Traits
{
readonly Actor self;
readonly Animation anim;
readonly WithCrateBodyInfo info;
public WithCrateBody(Actor self, WithCrateBodyInfo info)
{
this.self = self;
this.info = info;
var rs = self.Trait<RenderSprites>();
var image = rs.GetImage(self);
var images = info.XmasImages.Any() && DateTime.Today.Month == 12 ? info.XmasImages : new[] { image };
anim = new Animation(self.World, images.Random(Game.CosmeticRandom));
anim.Play("idle");
anim.Play(info.IdleSequence);
rs.Add(anim);
}
public void OnLanded()
{
var seq = self.World.Map.GetTerrainInfo(self.Location).IsWater ? "water" : "land";
anim.PlayRepeating(seq);
var sequence = self.World.Map.GetTerrainInfo(self.Location).IsWater ? info.WaterSequence : info.LandSequence;
if (!string.IsNullOrEmpty(sequence))
anim.PlayRepeating(sequence);
}
}
}

8
OpenRA.Mods.Common/Traits/Render/WithDeathAnimation.cs
View File

@@ -19,8 +19,8 @@ namespace OpenRA.Mods.Common.Traits
[Desc("This actor has a death animation.")]
public class WithDeathAnimationInfo : ITraitInfo, Requires<RenderSpritesInfo>
{
[Desc("Sequence to play when this actor is killed by a warhead.")]
public readonly string DeathSequence = "die";
[Desc("Sequence prefix to play when this actor is killed by a warhead.")]
[SequenceReference(null, true)] public readonly string DeathSequence = "die";
[Desc("The palette used for `DeathSequence`.")]
public readonly string DeathSequencePalette = "player";
@@ -29,10 +29,10 @@ namespace OpenRA.Mods.Common.Traits
public readonly bool DeathPaletteIsPlayerPalette = true;
[Desc("Should DeathType-specific sequences be used (sequence name = DeathSequence + DeathType).")]
public readonly bool UseDeathTypeSuffix = true;
public readonly bool UseDeathTypeSuffix = true; // TODO: check the complete sequence with lint rules
[Desc("Sequence to play when this actor is crushed.")]
public readonly string CrushedSequence = "die-crushed";
[SequenceReference] public readonly string CrushedSequence = null;
[Desc("The palette used for `CrushedSequence`.")]
public readonly string CrushedSequencePalette = "effect";

2
OpenRA.Mods.Common/Traits/Render/WithDockingOverlay.cs
View File

@@ -18,7 +18,7 @@ namespace OpenRA.Mods.Common.Traits
public class WithDockingOverlayInfo : ITraitInfo, Requires<RenderSpritesInfo>, Requires<IBodyOrientationInfo>
{
[Desc("Sequence name to use")]
public readonly string Sequence = "docking-overlay";
[SequenceReference] public readonly string Sequence = "docking-overlay";
[Desc("Position relative to body")]
public readonly WVec Offset = WVec.Zero;

2
OpenRA.Mods.Common/Traits/Render/WithHarvestAnimation.cs
View File

@@ -18,7 +18,7 @@ namespace OpenRA.Mods.Common.Traits
class WithHarvestAnimationInfo : ITraitInfo, Requires<RenderSpritesInfo>, Requires<IBodyOrientationInfo>
{
[Desc("Sequence name to use")]
public readonly string Sequence = "harvest";
[SequenceReference] public readonly string Sequence = "harvest";
[Desc("Position relative to body")]
public readonly WVec Offset = WVec.Zero;

2
OpenRA.Mods.Common/Traits/Render/WithIdleOverlay.cs
View File

@@ -20,7 +20,7 @@ namespace OpenRA.Mods.Common.Traits
public class WithIdleOverlayInfo : UpgradableTraitInfo, ITraitInfo, IRenderActorPreviewSpritesInfo, Requires<RenderSpritesInfo>, Requires<IBodyOrientationInfo>
{
[Desc("Sequence name to use")]
public readonly string Sequence = "idle-overlay";
[SequenceReference] public readonly string Sequence = "idle-overlay";
[Desc("Position relative to body")]
public readonly WVec Offset = WVec.Zero;

13
OpenRA.Mods.Common/Traits/Render/WithInfantryBody.cs
View File

@@ -21,10 +21,11 @@ namespace OpenRA.Mods.Common.Traits
{
public readonly int MinIdleWaitTicks = 30;
public readonly int MaxIdleWaitTicks = 110;
public readonly string MoveSequence = "run";
public readonly string AttackSequence = "shoot";
public readonly string[] IdleSequences = { };
public readonly string[] StandSequences = { "stand" };
[SequenceReference] public readonly string MoveSequence = "run";
[SequenceReference] public readonly string AttackSequence = null;
[SequenceReference] public readonly string[] IdleSequences = { };
[SequenceReference] public readonly string[] StandSequences = { "stand" };
public virtual object Create(ActorInitializer init) { return new WithInfantryBody(init, this); }
@@ -92,11 +93,13 @@ namespace OpenRA.Mods.Common.Traits
}
public void Attacking(Actor self, Target target)
{
if (!string.IsNullOrEmpty(Info.AttackSequence) && DefaultAnimation.HasSequence(NormalizeInfantrySequence(self, Info.AttackSequence)))
{
state = AnimationState.Attacking;
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)
{

2
OpenRA.Mods.Common/Traits/Render/WithMakeAnimation.cs
View File

@@ -21,7 +21,7 @@ namespace OpenRA.Mods.Common.Traits
public class WithMakeAnimationInfo : ITraitInfo, Requires<BuildingInfo>, Requires<RenderBuildingInfo>
{
[Desc("Sequence name to use")]
public readonly string Sequence = "make";
[SequenceReference] public readonly string Sequence = "make";
public object Create(ActorInitializer init) { return new WithMakeAnimation(init, this); }
}

2
OpenRA.Mods.Common/Traits/Render/WithMoveAnimation.cs
View File

@@ -16,7 +16,7 @@ namespace OpenRA.Mods.Common.Traits
public class WithMoveAnimationInfo : ITraitInfo, Requires<WithFacingSpriteBodyInfo>, Requires<IMoveInfo>
{
[Desc("Displayed while moving.")]
public readonly string MoveSequence = "move";
[SequenceReference] public readonly string MoveSequence = "move";
public object Create(ActorInitializer init) { return new WithMoveAnimation(init, this); }
}

2
OpenRA.Mods.Common/Traits/Render/WithProductionOverlay.cs
View File

@@ -20,7 +20,7 @@ namespace OpenRA.Mods.Common.Traits
public class WithProductionOverlayInfo : ITraitInfo, Requires<RenderSpritesInfo>, Requires<IBodyOrientationInfo>
{
[Desc("Sequence name to use")]
public readonly string Sequence = "production-overlay";
[SequenceReference] public readonly string Sequence = "production-overlay";
[Desc("Position relative to body")]
public readonly WVec Offset = WVec.Zero;

2
OpenRA.Mods.Common/Traits/Render/WithRepairAnimation.cs
View File

@@ -18,7 +18,7 @@ namespace OpenRA.Mods.Common.Traits
public class WithRepairAnimationInfo : ITraitInfo, Requires<RenderBuildingInfo>
{
[Desc("Sequence name to use")]
public readonly string Sequence = "active";
[SequenceReference] public readonly string Sequence = "active";
public readonly bool PauseOnLowPower = false;

2
OpenRA.Mods.Common/Traits/Render/WithRepairOverlay.cs
View File

@@ -19,7 +19,7 @@ namespace OpenRA.Mods.Common.Traits
public class WithRepairOverlayInfo : ITraitInfo, Requires<RenderSpritesInfo>, Requires<IBodyOrientationInfo>
{
[Desc("Sequence name to use")]
public readonly string Sequence = "active";
[SequenceReference] public readonly string Sequence = "active";
[Desc("Position relative to body")]
public readonly WVec Offset = WVec.Zero;

2
OpenRA.Mods.Common/Traits/Render/WithResources.cs
View File

@@ -17,7 +17,7 @@ namespace OpenRA.Mods.Common.Traits
class WithResourcesInfo : ITraitInfo, Requires<RenderSimpleInfo>
{
[Desc("Sequence name to use")]
public readonly string Sequence = "resources";
[SequenceReference] public readonly string Sequence = "resources";
public object Create(ActorInitializer init) { return new WithResources(init.Self, this); }
}

4
OpenRA.Mods.Common/Traits/Render/WithRotor.cs
View File

@@ -20,10 +20,10 @@ namespace OpenRA.Mods.Common.Traits
public class WithRotorInfo : ITraitInfo, IRenderActorPreviewSpritesInfo, Requires<RenderSpritesInfo>, Requires<IBodyOrientationInfo>
{
[Desc("Sequence name to use when flying")]
public readonly string Sequence = "rotor";
[SequenceReference] public readonly string Sequence = "rotor";
[Desc("Sequence name to use when landed")]
public readonly string GroundSequence = "slow-rotor";
[SequenceReference] public readonly string GroundSequence = "slow-rotor";
[Desc("Position relative to body")]
public readonly WVec Offset = WVec.Zero;

17
OpenRA.Mods.Common/Traits/Render/WithSmoke.cs
View File

@@ -16,19 +16,26 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Renders an overlay when the actor is taking heavy damage.")]
public class WithSmokeInfo : ITraitInfo, Requires<RenderSpritesInfo>
{
[Desc("Needs to define \"idle\", \"loop\" and \"end\" sub-sequences.")]
public readonly string Sequence = "smoke_m";
[SequenceReference("Sequence")] public readonly string IdleSequence = "idle";
[SequenceReference("Sequence")] public readonly string LoopSequence = "loop";
[SequenceReference("Sequence")] public readonly string EndSequence = "end";
public object Create(ActorInitializer init) { return new WithSmoke(init.Self, this); }
}
public class WithSmoke : INotifyDamage
{
readonly WithSmokeInfo info;
readonly Animation anim;
bool isSmoking;
Animation anim;
public WithSmoke(Actor self, WithSmokeInfo info)
{
this.info = info;
var rs = self.Trait<RenderSprites>();
anim = new Animation(self.World, info.Sequence);
@@ -42,9 +49,9 @@ namespace OpenRA.Mods.Common.Traits
if (e.DamageState < DamageState.Heavy) return;
isSmoking = true;
anim.PlayThen("idle",
() => anim.PlayThen("loop",
() => anim.PlayBackwardsThen("end",
anim.PlayThen(info.IdleSequence,
() => anim.PlayThen(info.LoopSequence,
() => anim.PlayBackwardsThen(info.EndSequence,
() => isSmoking = false)));
}
}

4
OpenRA.Mods.Common/Traits/Render/WithSpriteBody.cs
View File

@@ -21,10 +21,10 @@ namespace OpenRA.Mods.Common.Traits
Requires<RenderSpritesInfo>
{
[Desc("Animation to play when the actor is created.")]
public readonly string StartSequence = null;
[SequenceReference] public readonly string StartSequence = null;
[Desc("Animation to play when the actor is idle.")]
public readonly string Sequence = "idle";
[SequenceReference] public readonly string Sequence = "idle";
public virtual object Create(ActorInitializer init) { return new WithSpriteBody(init, this); }

4
OpenRA.Mods.Common/Traits/Render/WithTurret.cs
View File

@@ -21,10 +21,10 @@ namespace OpenRA.Mods.Common.Traits
Requires<RenderSpritesInfo>, Requires<TurretedInfo>, Requires<IBodyOrientationInfo>
{
[Desc("Sequence name to use")]
public readonly string Sequence = "turret";
[SequenceReference] public readonly string Sequence = "turret";
[Desc("Sequence name to use when prepared to fire")]
public readonly string AimSequence = null;
[SequenceReference] public readonly string AimSequence = null;
[Desc("Turreted 'Turret' key to display")]
public readonly string Turret = "primary";

3
OpenRA.Mods.Common/Traits/SmokeTrailWhenDamaged.cs
View File

@@ -19,6 +19,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly WVec Offset = WVec.Zero;
public readonly int Interval = 3;
public readonly string Sprite = "smokey";
[SequenceReference("Sprite")] public readonly string Sequence = "idle";
public readonly string Palette = "effect";
public readonly DamageState MinDamage = DamageState.Heavy;
@@ -46,7 +47,7 @@ namespace OpenRA.Mods.Common.Traits
{
var offset = info.Offset.Rotate(body.QuantizeOrientation(self, self.Orientation));
var pos = position + body.LocalToWorld(offset);
self.World.AddFrameEndTask(w => w.Add(new Smoke(w, pos, info.Sprite, info.Palette)));
self.World.AddFrameEndTask(w => w.Add(new Smoke(w, pos, info.Sprite, info.Palette, info.Sequence)));
}
ticks = info.Interval;

3
OpenRA.Mods.Common/Traits/World/SmudgeLayer.cs
View File

@@ -28,6 +28,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Sprite sequence name")]
public readonly string SmokeType = "smoke_m";
[SequenceReference("SmokeType")] public readonly string SmokeSequence = "idle";
public readonly string SmokePalette = "effect";
@@ -99,7 +100,7 @@ namespace OpenRA.Mods.Common.Traits
public void AddSmudge(CPos loc)
{
if (Game.CosmeticRandom.Next(0, 100) <= Info.SmokePercentage)
world.AddFrameEndTask(w => w.Add(new Smoke(w, world.Map.CenterOfCell(loc), Info.SmokeType, Info.SmokePalette)));
world.AddFrameEndTask(w => w.Add(new Smoke(w, world.Map.CenterOfCell(loc), Info.SmokeType, Info.SmokePalette, Info.SmokeSequence)));
if (!dirty.ContainsKey(loc) && !tiles.ContainsKey(loc))
{

2
OpenRA.Mods.D2k/Traits/Render/WithAttackOverlay.cs
View File

@@ -18,7 +18,7 @@ namespace OpenRA.Mods.D2k.Traits
public class WithAttackOverlayInfo : ITraitInfo, Requires<RenderSpritesInfo>
{
[Desc("Sequence name to use")]
public readonly string Sequence = null;
[SequenceReference] public readonly string Sequence = null;
[Desc("Custom palette name")]
public readonly string Palette = null;

2
OpenRA.Mods.D2k/Traits/Render/WithCrumbleOverlay.cs
View File

@@ -18,7 +18,7 @@ namespace OpenRA.Mods.D2k.Traits
public class WithCrumbleOverlayInfo : ITraitInfo, Requires<RenderSpritesInfo>
{
[Desc("Sequence name to use")]
public readonly string Sequence = "crumble-overlay";
[SequenceReference] public readonly string Sequence = "crumble-overlay";
[Desc("Custom palette name")]
public readonly string Palette = null;

2
OpenRA.Mods.D2k/Traits/Render/WithDeliveryOverlay.cs
View File

@@ -19,7 +19,7 @@ namespace OpenRA.Mods.D2k.Traits
public class WithDeliveryOverlayInfo : ITraitInfo, Requires<RenderSpritesInfo>, Requires<IBodyOrientationInfo>
{
[Desc("Sequence name to use")]
public readonly string Sequence = "active";
[SequenceReference] public readonly string Sequence = "active";
[Desc("Position relative to body")]
public readonly WVec Offset = WVec.Zero;

2
OpenRA.Mods.RA/Traits/MadTank.cs
View File

@@ -24,7 +24,7 @@ namespace OpenRA.Mods.RA.Traits
{
class MadTankInfo : ITraitInfo, Requires<ExplodesInfo>, Requires<WithFacingSpriteBodyInfo>
{
public readonly string ThumpSequence = "piston";
[SequenceReference] public readonly string ThumpSequence = "piston";
public readonly int ThumpInterval = 8;
[WeaponReference]
public readonly string ThumpDamageWeapon = "MADTankThump";

4
OpenRA.Mods.RA/Traits/Render/RenderLandingCraft.cs
View File

@@ -17,8 +17,8 @@ namespace OpenRA.Mods.RA.Traits
public class RenderLandingCraftInfo : RenderUnitInfo, Requires<IMoveInfo>, Requires<CargoInfo>
{
public readonly string[] OpenTerrainTypes = { "Clear" };
public readonly string OpenAnim = "open";
public readonly string UnloadAnim = "unload";
[SequenceReference] public readonly string OpenAnim = "open";
[SequenceReference] public readonly string UnloadAnim = "unload";
public override object Create(ActorInitializer init) { return new RenderLandingCraft(init, this); }
}

4
mods/cnc/rules/defaults.yaml
View File

@@ -199,6 +199,7 @@
ExplosionDeath: 4
FireDeath: 5
TiberiumDeath: 6
CrushedSequence: die-crushed
AttackMove:
Passenger:
CargoType: Infantry
@@ -273,6 +274,8 @@
CrushSound: squish2.aud
Voiced:
VoiceSet: CivilianMaleVoice
WithInfantryBody:
AttackSequence: shoot
^DINO:
AppearsOnRadar:
@@ -309,6 +312,7 @@
HiddenUnderFog:
GivesExperience:
WithInfantryBody:
AttackSequence: attack
WithDeathAnimation:
UseDeathTypeSuffix: false
EditorAppearance:

6
mods/cnc/rules/infantry.yaml
View File

@@ -19,6 +19,7 @@ E1:
WithInfantryBody:
IdleSequences: idle1,idle2,idle3,idle4
StandSequences: stand, stand2
AttackSequence: shoot
E2:
Inherits: ^Infantry
@@ -42,6 +43,7 @@ E2:
AttackFrontal:
TakeCover:
WithInfantryBody:
AttackSequence: throw
IdleSequences: idle1,idle2
StandSequences: stand, stand2
Explodes:
@@ -72,6 +74,7 @@ E3:
AttackFrontal:
TakeCover:
WithInfantryBody:
AttackSequence: shoot
IdleSequences: idle1,idle2
StandSequences: stand, stand2
@@ -101,6 +104,7 @@ E4:
SplitFacings: true
TakeCover:
WithInfantryBody:
AttackSequence: shoot
IdleSequences: idle1,idle2
StandSequences: stand, stand2
@@ -138,6 +142,7 @@ E5:
WithInfantryBody:
IdleSequences: idle1,idle2
StandSequences: stand, stand2
AttackSequence: shoot
E6:
Inherits: ^Infantry
@@ -202,6 +207,7 @@ RMBO:
Voice: Attack
TakeCover:
WithInfantryBody:
AttackSequence: shoot
IdleSequences: idle1,idle2,idle3
StandSequences: stand, stand2
AnnounceOnBuild:

8
mods/cnc/sequences/funpark.yaml
View File

@@ -8,7 +8,7 @@ steg:
Start: 16
Length: 8
Facings: 8
shoot:
attack:
Start: 80
Length: 12
Facings: 8
@@ -27,7 +27,7 @@ trex:
Start: 16
Length: 8
Facings: 8
shoot:
attack:
Start: 80
Length: 8
Facings: 8
@@ -46,7 +46,7 @@ tric:
Start: 16
Length: 8
Facings: 8
shoot:
attack:
Start: 80
Length: 12
Facings: 8
@@ -65,7 +65,7 @@ rapt:
Start: 16
Length: 8
Facings: 8
shoot:
attack:
Start: 80
Length: 8
Facings: 8

4
mods/cnc/sequences/infantry.yaml
View File

@@ -165,7 +165,7 @@ e2:
Length: 6
Facings: 8
Tick: 100
shoot:
throw:
Start: 64
Length: 20
Facings: 8
@@ -188,7 +188,7 @@ e2:
Length: 4
Facings: 8
Tick: 100
prone-shoot:
prone-throw:
Start: 288
Length: 12
Facings: 8

1
mods/d2k/rules/defaults.yaml
View File

@@ -231,6 +231,7 @@
SoundDeath: 2
SmallExplosionDeath: 3
BulletDeath: 4
CrushedSequence: die-crushed
AutoTarget:
AttackMove:
Passenger:

5
mods/d2k/rules/infantry.yaml
View File

@@ -17,6 +17,7 @@ rifle:
AttackFrontal:
TakeCover:
WithInfantryBody:
AttackSequence: shoot
AttractsWorms:
Intensity: 120
@@ -71,6 +72,7 @@ bazooka:
AttackFrontal:
TakeCover:
WithInfantryBody:
AttackSequence: shoot
AttractsWorms:
Intensity: 180
@@ -133,6 +135,7 @@ fremen:
AttackFrontal:
TakeCover:
WithInfantryBody:
AttackSequence: shoot
Cloak:
InitialDelay: 250
CloakDelay: 250
@@ -164,6 +167,7 @@ grenadier:
AttackFrontal:
TakeCover:
WithInfantryBody:
AttackSequence: throw
IdleSequences: idle
Explodes:
Weapon: UnitExplodeSmall
@@ -190,6 +194,7 @@ sardaukar:
Range: 6c0
TakeCover:
WithInfantryBody:
AttackSequence: shoot
Armament@PRIMARY:
Weapon: Vulcan
Armament@SECONDARY:

4
mods/d2k/sequences/infantry.yaml
View File

@@ -427,7 +427,7 @@ grenadier: # 2502 - 2749 in 1.06 DATA.R8
Length: 6
Facings: 8
Tick: 120
shoot: grenadier.shp
throw: grenadier.shp
Start: 56
Length: 6
Facings: 8
@@ -458,7 +458,7 @@ grenadier: # 2502 - 2749 in 1.06 DATA.R8
Length: 4
Facings: 8
Tick: 120
prone-shoot: grenadier.shp
prone-throw: grenadier.shp
Start: 136
Length: 5
Facings: 8

13
mods/ra/rules/defaults.yaml
View File

@@ -150,6 +150,8 @@
ParachuteOffset: 0,0,200
KilledOnImpassableTerrain: true
ParachuteSequence: parach
ParachuteOpenSequence: open
ParachuteIdleSequence: idle
ShadowSequence:
GroundCorpseSequence:
GroundCorpsePalette:
@@ -199,6 +201,7 @@
ExplosionDeath: 4
FireDeath: 5
ElectricityDeath: 6
CrushedSequence: die-crushed
AutoTarget:
AttackMove:
Passenger:
@@ -238,9 +241,12 @@
ParachuteOffset: 0,0,427
KilledOnImpassableTerrain: true
ParachuteSequence: parach
ParachuteOpenSequence: open
ParachuteIdleSequence: idle
ShadowSequence: parach-shadow
GroundImpactSound: squishy2.aud
WaterImpactSound: splash9.aud
WaterCorpseSequence: small_splash
Cloneable:
Types: Infantry
MustBeDestroyed:
@@ -666,9 +672,16 @@
Image: scrate
WithCrateBody:
XmasImages: xcratea, xcrateb, xcratec, xcrated
LandSequence: land
WaterSequence: water
Selectable:
Selectable: false
Bounds: 15,15,-1,-1
Parachutable:
KilledOnImpassableTerrain: false
ParachuteSequence: parach
ParachuteOpenSequence: open
ParachuteIdleSequence: idle
Passenger:
CustomSelectionSize:
CustomBounds: 16,16

19
mods/ra/rules/infantry.yaml
View File

@@ -35,12 +35,14 @@ DOG:
TargetableUnit:
TargetTypes: Ground, Infantry
WithInfantryBody:
AttackSequence: shoot
IdleSequences: idle1,idle2
IgnoresDisguise:
DetectCloaked:
Range: 5
Voiced:
VoiceSet: DogVoice
-TakeCover:
E1:
Inherits: ^Infantry
@@ -67,6 +69,7 @@ E1:
AttackFrontal:
TakeCover:
WithInfantryBody:
AttackSequence: shoot
IdleSequences: idle1,idle2
StandSequences: stand,stand2
@@ -97,6 +100,7 @@ E2:
AttackFrontal:
TakeCover:
WithInfantryBody:
AttackSequence: throw
IdleSequences: idle1,idle2
StandSequences: stand,stand2
Explodes:
@@ -131,6 +135,7 @@ E3:
AttackFrontal:
TakeCover:
WithInfantryBody:
AttackSequence: shoot
IdleSequences: idle1,idle2
StandSequences: stand,stand2
@@ -160,6 +165,7 @@ E4:
AttackFrontal:
TakeCover:
WithInfantryBody:
AttackSequence: shoot
IdleSequences: idle1,idle2
StandSequences: stand,stand2
@@ -226,6 +232,7 @@ SPY:
-AutoTarget:
-WithInfantryBody:
WithDisguisingInfantryBody:
AttackSequence: shoot
IdleSequences: idle1,idle2
StandSequences: stand,stand2
Armament:
@@ -288,6 +295,7 @@ E7:
AttackFrontal:
TakeCover:
WithInfantryBody:
AttackSequence: shoot
IdleSequences: idle1,idle2
AnnounceOnBuild:
AnnounceOnKill:
@@ -363,7 +371,7 @@ MECH:
-AutoTarget:
WithInfantryBody:
IdleSequences: idle1,idle2
AttackSequence: heal
AttackSequence: repair
Voiced:
VoiceSet: MechanicVoice
@@ -434,6 +442,7 @@ GNRL:
Voice: Move
Voiced:
VoiceSet: StavrosVoice
-ScaredyCat:
THF:
Inherits: ^Infantry
@@ -519,6 +528,7 @@ SHOK:
Voice: Move
TakeCover:
WithInfantryBody:
AttackSequence: shoot
IdleSequences: idle1,idle2
StandSequences: stand,stand2
Voiced:
@@ -555,6 +565,7 @@ SNIPER:
AttackFrontal:
TakeCover:
WithInfantryBody:
AttackSequence: shoot
IdleSequences: idle1,idle2
StandSequences: stand,stand2
Cloak:
@@ -585,10 +596,13 @@ Zombie:
AutoTarget:
ScanRadius: 5
AttackFrontal:
WithInfantryBody:
AttackSequence: bite
Armament:
Weapon: claw
Voiced:
VoiceSet: AntVoice
-TakeCover:
Ant:
Inherits: ^Infantry
@@ -615,6 +629,8 @@ Ant:
AutoTarget:
ScanRadius: 5
AttackFrontal:
WithInfantryBody:
AttackSequence: bite
Armament:
Weapon: mandible
TargetableUnit:
@@ -623,4 +639,5 @@ Ant:
UseDeathTypeSuffix: false
Voiced:
VoiceSet: AntVoice
-TakeCover:

10
mods/ra/sequences/infantry.yaml
View File

@@ -355,7 +355,7 @@ mech:
Length: 6
Facings: 8
Tick: 100
heal:
repair:
Start: 56
Length: 58
Tick: 120
@@ -422,7 +422,7 @@ e2:
Length: 6
Facings: 8
Tick: 80
shoot:
throw:
Start: 64
Length: 20
Facings: 8
@@ -472,7 +472,7 @@ e2:
Length: 4
Facings: 8
Tick: 80
prone-shoot:
prone-throw:
Start: 288
Length: 12
Facings: 8
@@ -1278,7 +1278,7 @@ zombie:
Start: 16
Length: 6
Facings: 8
shoot:
bite:
Start: 64
Length: 4
Facings: 8
@@ -1327,7 +1327,7 @@ ant:
Start: 8
Length: 8
Facings: 8
shoot:
bite:
Start: 72
Length: 4
Facings: 8

12
mods/ts/rules/civilian-infantry.yaml
View File

@@ -43,6 +43,7 @@ UMAGON:
Voice: Attack
TakeCover:
WithInfantryBody:
AttackSequence: shoot
IdleSequences: idle1,idle2
CHAMSPY:
@@ -91,6 +92,7 @@ MUTANT:
Voice: Attack
TakeCover:
WithInfantryBody:
AttackSequence: shoot
IdleSequences: idle1,idle2
MWMN:
@@ -115,6 +117,7 @@ MWMN:
Voice: Attack
TakeCover:
WithInfantryBody:
AttackSequence: shoot
IdleSequences: idle1,idle2
MUTANT3:
@@ -139,6 +142,7 @@ MUTANT3:
Voice: Attack
TakeCover:
WithInfantryBody:
AttackSequence: shoot
IdleSequences: idle1,idle2
TRATOS:
@@ -160,6 +164,7 @@ TRATOS:
TakeCover:
-AutoTarget:
WithInfantryBody:
AttackSequence: shoot
IdleSequences: idle1,idle2
OXANNA:
@@ -179,6 +184,7 @@ OXANNA:
TakeCover:
-AutoTarget:
WithInfantryBody:
AttackSequence: shoot
IdleSequences: idle1,idle2
SLAV:
@@ -198,6 +204,7 @@ SLAV:
TakeCover:
-AutoTarget:
WithInfantryBody:
AttackSequence: shoot
IdleSequences: idle1,idle2
DOGGIE:
@@ -228,6 +235,7 @@ DOGGIE:
WanderMoveRadius: 2
MinMoveDelayInTicks: 25
MaxMoveDelayInTicks: 45
-TakeCover:
VISSML:
Inherits: ^Viceroid
@@ -264,6 +272,8 @@ VISLRG:
CIV1:
Inherits: ^CivilianInfantry
WithInfantryBody:
AttackSequence: shoot
Armament:
Weapon: Pistola
AttackFrontal:
@@ -275,6 +285,8 @@ CIV2:
CIV3:
Inherits: ^CivilianInfantry
WithInfantryBody:
AttackSequence: shoot
Armament:
Weapon: Pistola
AttackFrontal:

2
mods/ts/rules/defaults.yaml
View File

@@ -301,6 +301,8 @@
Types: CivilianInfantry
-TakeCover:
WithInfantryBody:
WithDeathAnimation:
CrushedSequence: die-crushed
ScaredyCat:
-MustBeDestroyed:

2
mods/ts/rules/gdi-infantry.yaml
View File

@@ -83,6 +83,7 @@ JUMPJET:
Voice: Attack
TakeCover:
WithInfantryBody:
AttackSequence: shoot
GHOST:
Inherits: ^Infantry
@@ -119,5 +120,6 @@ GHOST:
Voice: Attack
TakeCover:
WithInfantryBody:
AttackSequence: shoot
IdleSequences: idle1,idle2

6
mods/ts/rules/nod-infantry.yaml
View File

@@ -22,6 +22,7 @@ E3:
Voice: Attack
TakeCover:
WithInfantryBody:
AttackSequence: shoot
IdleSequences: idle1,idle2
CYBORG:
@@ -56,10 +57,12 @@ CYBORG:
AttackFrontal:
Voice: Attack
WithInfantryBody:
AttackSequence: shoot
IdleSequences: idle1,idle2
WithPermanentInjury:
SelectionDecorations:
VisualBounds: 16,31,0,-10
-TakeCover:
CYC2:
Inherits: ^Infantry
@@ -95,10 +98,12 @@ CYC2:
AttackFrontal:
Voice: Attack
WithInfantryBody:
AttackSequence: shoot
IdleSequences: idle1,idle2
WithPermanentInjury:
SelectionDecorations:
VisualBounds: 16,32,-1,-12
-TakeCover:
MHIJACK:
Inherits: ^Infantry
@@ -126,5 +131,6 @@ MHIJACK:
-AutoTarget:
TakeCover:
WithInfantryBody:
AttackSequence: shoot
IdleSequences: idle1,idle2

1
mods/ts/rules/shared-infantry.yaml
View File

@@ -26,6 +26,7 @@ E1:
Voice: Attack
TakeCover:
WithInfantryBody:
AttackSequence: shoot
IdleSequences: idle1,idle2
ENGINEER:

5
mods/ts/sequences/infantry.yaml
View File

@@ -111,12 +111,13 @@ e2:
ShadowStart: 451
Tick: 800
ZOffset: -511
shoot:
throw:
Start: 164
Length: 6
Facings: 8
ShadowStart: 456
prone-shoot:
prone-throw:
Tick: 80
Start: 212
Length: 6
Facings: 8