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

Merge pull request #8642 from reaperrr/fix-lst

Browse Source 
Added separate CloseSequence to WithLandingCraftAnimation
This commit is contained in:
Pavel Penev
2015-07-05 14:55:51 +03:00
parent 5187a958ff 26a202600d
commit f05b71ada2
4 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.Common/Traits/Render/WithAttackAnimation.cs
View File

@@ -13,7 +13,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
public class WithAttackAnimationInfo : ITraitInfo, Requires<WithFacingSpriteBodyInfo>, Requires<ArmamentInfo>, Requires<AttackBaseInfo>
public class WithAttackAnimationInfo : ITraitInfo, Requires<WithSpriteBodyInfo>, Requires<ArmamentInfo>, Requires<AttackBaseInfo>
{
[Desc("Armament name")]
public readonly string Armament = "primary";
@@ -35,7 +35,7 @@ namespace OpenRA.Mods.Common.Traits
readonly WithAttackAnimationInfo info;
readonly AttackBase attack;
readonly Armament armament;
readonly WithFacingSpriteBody wfsb;
readonly WithSpriteBody wsb;
public WithAttackAnimation(ActorInitializer init, WithAttackAnimationInfo info)
{
@@ -43,13 +43,13 @@ namespace OpenRA.Mods.Common.Traits
attack = init.Self.Trait<AttackBase>();
armament = init.Self.TraitsImplementing<Armament>()
.Single(a => a.Info.Name == info.Armament);
wfsb = init.Self.Trait<WithFacingSpriteBody>();
wsb = init.Self.Trait<WithSpriteBody>();
}
public void Attacking(Actor self, Target target, Armament a, Barrel barrel)
{
if (!string.IsNullOrEmpty(info.AttackSequence))
wfsb.PlayCustomAnimation(self, info.AttackSequence);
wsb.PlayCustomAnimation(self, info.AttackSequence);
}
public void Tick(Actor self)
@@ -57,7 +57,7 @@ namespace OpenRA.Mods.Common.Traits
if (string.IsNullOrEmpty(info.AimSequence) && string.IsNullOrEmpty(info.ReloadPrefix))
return;
var sequence = wfsb.Info.Sequence;
var sequence = wsb.Info.Sequence;
if (!string.IsNullOrEmpty(info.AimSequence) && attack.IsAttacking)
sequence = info.AimSequence;
@@ -66,7 +66,7 @@ namespace OpenRA.Mods.Common.Traits
if (!string.IsNullOrEmpty(prefix) && sequence != (prefix + sequence))
sequence = prefix + sequence;
wfsb.DefaultAnimation.ReplaceAnim(sequence);
wsb.DefaultAnimation.ReplaceAnim(sequence);
}
}
}

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

@@ -13,7 +13,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
public class WithMoveAnimationInfo : ITraitInfo, Requires<WithFacingSpriteBodyInfo>, Requires<IMoveInfo>
public class WithMoveAnimationInfo : ITraitInfo, Requires<WithSpriteBodyInfo>, Requires<IMoveInfo>
{
[Desc("Displayed while moving.")]
[SequenceReference] public readonly string MoveSequence = "move";
@@ -25,7 +25,7 @@ namespace OpenRA.Mods.Common.Traits
{
readonly WithMoveAnimationInfo info;
readonly IMove movement;
readonly WithFacingSpriteBody wfsb;
readonly WithSpriteBody wsb;
WPos cachedPosition;
@@ -33,7 +33,7 @@ namespace OpenRA.Mods.Common.Traits
{
this.info = info;
movement = init.Self.Trait<IMove>();
wfsb = init.Self.Trait<WithFacingSpriteBody>();
wsb = init.Self.Trait<WithSpriteBody>();
cachedPosition = init.Self.CenterPosition;
}
@@ -45,10 +45,10 @@ namespace OpenRA.Mods.Common.Traits
// Flying units set IsMoving whenever they are airborne, which isn't enough for our purposes
var isMoving = movement.IsMoving && !self.IsDead && (oldCachedPosition - cachedPosition).HorizontalLengthSquared != 0;
if (isMoving ^ (wfsb.DefaultAnimation.CurrentSequence.Name != info.MoveSequence))
if (isMoving ^ (wsb.DefaultAnimation.CurrentSequence.Name != info.MoveSequence))
return;
wfsb.DefaultAnimation.ReplaceAnim(isMoving ? info.MoveSequence : wfsb.Info.Sequence);
wsb.DefaultAnimation.ReplaceAnim(isMoving ? info.MoveSequence : wsb.Info.Sequence);
}
}
}