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

Expose delay of WithDeathAnimation

Browse Source 
Allows to show it a few ticks after death if the modder
wishes so.
This commit is contained in:
reaperrr
2019-08-11 19:09:23 +02:00
committed by Paul Chote
parent c55c65f6d7
commit 7a57f0e6ef
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,6 +53,9 @@ namespace OpenRA.Mods.Common.Traits.Render
[Desc("Sequence to use when the actor is killed by some non-standard means (e.g. suicide).")] [Desc("Sequence to use when the actor is killed by some non-standard means (e.g. suicide).")]
public readonly string FallbackSequence = null; public readonly string FallbackSequence = null;
[Desc("Delay the spawn of the death animation by this many ticks.")]
public readonly int Delay = 0;
public override object Create(ActorInitializer init) { return new WithDeathAnimation(init.Self, this); } public override object Create(ActorInitializer init) { return new WithDeathAnimation(init.Self, this); }
} }
@@ -81,7 +84,7 @@ namespace OpenRA.Mods.Common.Traits.Render
if (e.Damage.DamageTypes.IsEmpty) if (e.Damage.DamageTypes.IsEmpty)
{ {
if (Info.FallbackSequence != null) if (Info.FallbackSequence != null)
SpawnDeathAnimation(self, self.CenterPosition, rs.GetImage(self), Info.FallbackSequence, palette); SpawnDeathAnimation(self, self.CenterPosition, rs.GetImage(self), Info.FallbackSequence, palette, Info.Delay);
return; return;
} }
@@ -96,12 +99,12 @@ namespace OpenRA.Mods.Common.Traits.Render
sequence += Info.DeathTypes[damageType].Random(self.World.SharedRandom); sequence += Info.DeathTypes[damageType].Random(self.World.SharedRandom);
} }
SpawnDeathAnimation(self, self.CenterPosition, rs.GetImage(self), sequence, palette); SpawnDeathAnimation(self, self.CenterPosition, rs.GetImage(self), sequence, palette, Info.Delay);
} }
public void SpawnDeathAnimation(Actor self, WPos pos, string image, string sequence, string palette) public void SpawnDeathAnimation(Actor self, WPos pos, string image, string sequence, string palette, int delay)
{ {
self.World.AddFrameEndTask(w => w.Add(new SpriteEffect(pos, w, image, sequence, palette))); self.World.AddFrameEndTask(w => w.Add(new SpriteEffect(pos, w, image, sequence, palette, delay: delay)));
} }
void INotifyCrushed.OnCrush(Actor self, Actor crusher, BitSet<CrushClass> crushClasses) void INotifyCrushed.OnCrush(Actor self, Actor crusher, BitSet<CrushClass> crushClasses)
@@ -115,7 +118,7 @@ namespace OpenRA.Mods.Common.Traits.Render
if (Info.CrushedPaletteIsPlayerPalette) if (Info.CrushedPaletteIsPlayerPalette)
crushPalette += self.Owner.InternalName; crushPalette += self.Owner.InternalName;
SpawnDeathAnimation(self, self.CenterPosition, rs.GetImage(self), Info.CrushedSequence, crushPalette); SpawnDeathAnimation(self, self.CenterPosition, rs.GetImage(self), Info.CrushedSequence, crushPalette, Info.Delay);
} }
void INotifyCrushed.WarnCrush(Actor self, Actor crusher, BitSet<CrushClass> crushClasses) { } void INotifyCrushed.WarnCrush(Actor self, Actor crusher, BitSet<CrushClass> crushClasses) { }