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

Make WithMoveAnimation conditional and modify only a single assigned sprite body

Browse Source 
The latter to match what we do on WithAttackAnimation already.
This commit is contained in:
reaperrr
2017-06-29 21:53:31 +02:00
committed by RoosterDragon
parent 8a5a8a1646
commit 9c2e3aaa05
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,44 +14,49 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits.Render
{
public class WithMoveAnimationInfo : ITraitInfo, Requires<WithSpriteBodyInfo>, Requires<IMoveInfo>
public class WithMoveAnimationInfo : ConditionalTraitInfo, Requires<WithSpriteBodyInfo>, Requires<IMoveInfo>
{
[Desc("Displayed while moving.")]
[SequenceReference] public readonly string MoveSequence = "move";
[Desc("Which sprite body to modify.")]
public readonly string[] BodyNames = { "body" };
public readonly string Body = "body";
public object Create(ActorInitializer init) { return new WithMoveAnimation(init, this); }
public override object Create(ActorInitializer init) { return new WithMoveAnimation(init, this); }
public override void RulesetLoaded(Ruleset rules, ActorInfo ai)
{
var matches = ai.TraitInfos<WithSpriteBodyInfo>().Count(w => w.Name == Body);
if (matches != 1)
throw new YamlException("WithMoveAnimation needs exactly one sprite body with matching name.");
base.RulesetLoaded(rules, ai);
}
}
public class WithMoveAnimation : ITick
public class WithMoveAnimation : ConditionalTrait<WithMoveAnimationInfo>, ITick
{
readonly WithMoveAnimationInfo info;
readonly IMove movement;
readonly WithSpriteBody[] wsbs;
readonly WithSpriteBody wsb;
public WithMoveAnimation(ActorInitializer init, WithMoveAnimationInfo info)
: base(info)
{
this.info = info;
movement = init.Self.Trait<IMove>();
wsbs = init.Self.TraitsImplementing<WithSpriteBody>().Where(w => info.BodyNames.Contains(w.Info.Name)).ToArray();
wsb = init.Self.TraitsImplementing<WithSpriteBody>().First(w => w.Info.Name == Info.Body);
}
void ITick.Tick(Actor self)
{
if (IsTraitDisabled || wsb.IsTraitDisabled)
return;
var isMoving = movement.IsMoving && !self.IsDead;
foreach (var wsb in wsbs)
{
if (wsb.IsTraitDisabled)
continue;
if (isMoving ^ (wsb.DefaultAnimation.CurrentSequence.Name != Info.MoveSequence))
return;
if (isMoving ^ (wsb.DefaultAnimation.CurrentSequence.Name != info.MoveSequence))
continue;
wsb.DefaultAnimation.ReplaceAnim(isMoving ? info.MoveSequence : wsb.Info.Sequence);
}
wsb.DefaultAnimation.ReplaceAnim(isMoving ? Info.MoveSequence : wsb.Info.Sequence);
}
}
}