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

Merge pull request #8508 from reaperrr/damaged-sprites

Browse Source 
Added support for damage stages to WithSpriteBody and WithTurret
This commit is contained in:
Pavel Penev
2015-06-25 00:35:05 +03:00
parent e4f3a17477 248e6b0e18
commit 55128b8f78
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,7 +42,7 @@ namespace OpenRA.Mods.Common.Traits
} }
} }
public class WithSpriteBody : UpgradableTrait<WithSpriteBodyInfo>, ISpriteBody public class WithSpriteBody : UpgradableTrait<WithSpriteBodyInfo>, ISpriteBody, INotifyDamageStateChanged
{ {
public readonly Animation DefaultAnimation; public readonly Animation DefaultAnimation;
@@ -94,5 +94,11 @@ namespace OpenRA.Mods.Common.Traits
after(); after();
}); });
} }
public virtual void DamageStateChanged(Actor self, AttackInfo e)
{
if (DefaultAnimation.CurrentSequence != null)
DefaultAnimation.ReplaceAnim(NormalizeSequence(self, DefaultAnimation.CurrentSequence.Name));
}
} }
} }

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

@@ -56,14 +56,14 @@ namespace OpenRA.Mods.Common.Traits
} }
} }
public class WithTurret : UpgradableTrait<WithTurretInfo>, ITick public class WithTurret : UpgradableTrait<WithTurretInfo>, ITick, INotifyDamageStateChanged
{ {
RenderSprites rs; RenderSprites rs;
IBodyOrientation body; IBodyOrientation body;
AttackBase ab; AttackBase ab;
Turreted t; Turreted t;
Armament[] arms; Armament[] arms;
Animation anim; public readonly Animation DefaultAnimation;
public WithTurret(Actor self, WithTurretInfo info) public WithTurret(Actor self, WithTurretInfo info)
: base(info) : base(info)
@@ -77,13 +77,13 @@ namespace OpenRA.Mods.Common.Traits
arms = self.TraitsImplementing<Armament>() arms = self.TraitsImplementing<Armament>()
.Where(w => w.Info.Turret == info.Turret).ToArray(); .Where(w => w.Info.Turret == info.Turret).ToArray();
anim = new Animation(self.World, rs.GetImage(self), () => t.TurretFacing); DefaultAnimation = new Animation(self.World, rs.GetImage(self), () => t.TurretFacing);
anim.Play(info.Sequence); DefaultAnimation.PlayRepeating(NormalizeSequence(self, info.Sequence));
rs.Add(new AnimationWithOffset( rs.Add(new AnimationWithOffset(
anim, () => TurretOffset(self), () => IsTraitDisabled, () => false, p => ZOffsetFromCenter(self, p, 1))); DefaultAnimation, () => TurretOffset(self), () => IsTraitDisabled, () => false, p => ZOffsetFromCenter(self, p, 1)));
// Restrict turret facings to match the sprite // Restrict turret facings to match the sprite
t.QuantizedFacings = anim.CurrentSequence.Facings; t.QuantizedFacings = DefaultAnimation.CurrentSequence.Facings;
} }
WVec TurretOffset(Actor self) WVec TurretOffset(Actor self)
@@ -98,13 +98,24 @@ namespace OpenRA.Mods.Common.Traits
return t.Position(self) + body.LocalToWorld(localOffset.Rotate(turretOrientation).Rotate(bodyOrientation)); return t.Position(self) + body.LocalToWorld(localOffset.Rotate(turretOrientation).Rotate(bodyOrientation));
} }
public string NormalizeSequence(Actor self, string sequence)
{
return RenderSprites.NormalizeSequence(DefaultAnimation, self.GetDamageState(), sequence);
}
public virtual void DamageStateChanged(Actor self, AttackInfo e)
{
if (DefaultAnimation.CurrentSequence != null)
DefaultAnimation.ReplaceAnim(NormalizeSequence(self, DefaultAnimation.CurrentSequence.Name));
}
public void Tick(Actor self) public void Tick(Actor self)
{ {
if (Info.AimSequence == null) if (Info.AimSequence == null)
return; return;
var sequence = ab.IsAttacking ? Info.AimSequence : Info.Sequence; var sequence = ab.IsAttacking ? Info.AimSequence : Info.Sequence;
anim.ReplaceAnim(sequence); DefaultAnimation.ReplaceAnim(sequence);
} }
public static int ZOffsetFromCenter(Actor self, WPos pos, int offset) public static int ZOffsetFromCenter(Actor self, WPos pos, int offset)