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

Adapt WithMoveAnimation to INotifyMoving

Browse Source 
And add ValidMovementTypes for configurability.
This commit is contained in:
reaperrr
2019-03-11 00:50:51 +01:00
committed by Paul Chote
parent 4c53599736
commit 404eee23f9
1 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,9 @@ namespace OpenRA.Mods.Common.Traits.Render
[Desc("Which sprite body to modify.")]
public readonly string Body = "body";
[Desc("Apply condition on listed movement types. Available options are: None, Horizontal, Vertical, Turn.")]
public readonly MovementType ValidMovementTypes = MovementType.Horizontal;
public override object Create(ActorInitializer init) { return new WithMoveAnimation(init, this); }
public override void RulesetLoaded(Ruleset rules, ActorInfo ai)
@@ -34,7 +37,7 @@ namespace OpenRA.Mods.Common.Traits.Render
}
}
public class WithMoveAnimation : ConditionalTrait<WithMoveAnimationInfo>, ITick
public class WithMoveAnimation : ConditionalTrait<WithMoveAnimationInfo>, INotifyMoving
{
readonly IMove movement;
readonly WithSpriteBody wsb;
@@ -46,17 +49,35 @@ namespace OpenRA.Mods.Common.Traits.Render
wsb = init.Self.TraitsImplementing<WithSpriteBody>().Single(w => w.Info.Name == Info.Body);
}
void ITick.Tick(Actor self)
void UpdateAnimation(Actor self, MovementType types)
{
if (IsTraitDisabled || wsb.IsTraitDisabled)
var playAnim = false;
if (!IsTraitDisabled && (types & Info.ValidMovementTypes) != 0)
playAnim = true;
if (!playAnim && wsb.DefaultAnimation.CurrentSequence.Name == Info.MoveSequence)
{
wsb.CancelCustomAnimation(self);
return;
}
var isMoving = movement.CurrentMovementTypes.HasFlag(MovementType.Horizontal) && !self.IsDead;
if (playAnim && wsb.DefaultAnimation.CurrentSequence.Name != Info.MoveSequence)
wsb.PlayCustomAnimationRepeating(self, Info.MoveSequence);
}
if (isMoving ^ (wsb.DefaultAnimation.CurrentSequence.Name != Info.MoveSequence))
return;
void INotifyMoving.MovementTypeChanged(Actor self, MovementType types)
{
UpdateAnimation(self, types);
}
wsb.DefaultAnimation.ReplaceAnim(isMoving ? Info.MoveSequence : wsb.Info.Sequence);
protected override void TraitEnabled(Actor self)
{
UpdateAnimation(self, movement.CurrentMovementTypes);
}
protected override void TraitDisabled(Actor self)
{
UpdateAnimation(self, movement.CurrentMovementTypes);
}
}
}