Fix various Mods.Common animation traits not supporting actors having multiple sprite bodies

This commit is contained in:
reaperrr
2018-05-17 09:19:13 +02:00
committed by Matthias Mailänder
parent 0d0d2e0ae3
commit 9d24c40f92
10 changed files with 45 additions and 13 deletions

View File

@@ -9,6 +9,7 @@
*/
#endregion
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits.Render
@@ -20,6 +21,9 @@ namespace OpenRA.Mods.Common.Traits.Render
[Desc("Sequence to use for the charge levels.")]
public readonly string Sequence = "active";
[Desc("Which sprite body to play the animation on.")]
public readonly string Body = "body";
public object Create(ActorInitializer init) { return new WithChargeAnimation(init.Self, this); }
}
@@ -32,7 +36,7 @@ namespace OpenRA.Mods.Common.Traits.Render
public WithChargeAnimation(Actor self, WithChargeAnimationInfo info)
{
this.info = info;
wsb = self.Trait<WithSpriteBody>();
wsb = self.TraitsImplementing<WithSpriteBody>().Single(w => w.Info.Name == info.Body);
attackCharges = self.Trait<AttackCharges>();
}