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

Merge pull request #10009 from penev92/grantUpgradePower

Browse Source 
Check if WithSpriteBody is available in GrantUpgradePower
This commit is contained in:
abcdefg30
2015-11-16 13:55:48 +01:00
parent 7d2c86d75b 4d787cbedb
commit a5f15f5080
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Common/Traits/SupportPowers/GrantUpgradePower.cs
View File

@@ -30,7 +30,8 @@ namespace OpenRA.Mods.Common.Traits
public readonly int Range = 1; public readonly int Range = 1;
public readonly string GrantUpgradeSound = "ironcur9.aud"; public readonly string GrantUpgradeSound = "ironcur9.aud";
[Desc("Sequence to play for granting actor when activated."), SequenceReference] [SequenceReference, Desc("Sequence to play for granting actor when activated.",
"This requires the actor to have the WithSpriteBody trait or one of its derivatives.")]
public readonly string GrantUpgradeSequence = "active"; public readonly string GrantUpgradeSequence = "active";
public override object Create(ActorInitializer init) { return new GrantUpgradePower(init.Self, this); } public override object Create(ActorInitializer init) { return new GrantUpgradePower(init.Self, this); }
@@ -56,7 +57,9 @@ namespace OpenRA.Mods.Common.Traits
{ {
base.Activate(self, order, manager); base.Activate(self, order, manager);
self.Trait<WithSpriteBody>().PlayCustomAnimation(self, info.GrantUpgradeSequence); var wsb = self.TraitOrDefault<WithSpriteBody>();
if (wsb != null && wsb.DefaultAnimation.HasSequence(info.GrantUpgradeSequence))
wsb.PlayCustomAnimation(self, info.GrantUpgradeSequence);
Game.Sound.Play(info.GrantUpgradeSound, self.World.Map.CenterOfCell(order.TargetLocation)); Game.Sound.Play(info.GrantUpgradeSound, self.World.Map.CenterOfCell(order.TargetLocation));