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

Make WithSpriteBody.PlayCustomAnimation resume loop of Sequence

Browse Source 
...after it finished playing.
This commit is contained in:
reaperrr
2017-07-28 15:07:19 +02:00
committed by abcdefg30
parent 90a4fe7ca1
commit 0103b7ca87
8 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,8 +75,7 @@ namespace OpenRA.Mods.Common.Traits.Render
if (!IsTraitDisabled && !wsb.IsTraitDisabled && !string.IsNullOrEmpty(Info.AttackSequence)) if (!IsTraitDisabled && !wsb.IsTraitDisabled && !string.IsNullOrEmpty(Info.AttackSequence))
{ {
attackAnimPlaying = true; attackAnimPlaying = true;
wsb.PlayCustomAnimation(self, Info.AttackSequence, wsb.PlayCustomAnimation(self, Info.AttackSequence, () => attackAnimPlaying = false);
() => { wsb.CancelCustomAnimation(self); attackAnimPlaying = false; });
} }
} }

2
OpenRA.Mods.Common/Traits/Render/WithBuildingPlacedAnimation.cs
View File

@@ -57,7 +57,7 @@ namespace OpenRA.Mods.Common.Traits.Render
void INotifyBuildingPlaced.BuildingPlaced(Actor self) void INotifyBuildingPlaced.BuildingPlaced(Actor self)
{ {
if (buildComplete) if (buildComplete)
wsb.PlayCustomAnimation(self, info.Sequence, () => wsb.CancelCustomAnimation(self)); wsb.PlayCustomAnimation(self, info.Sequence);
} }
} }
} }

2
OpenRA.Mods.Common/Traits/Render/WithIdleAnimation.cs
View File

@@ -45,7 +45,7 @@ namespace OpenRA.Mods.Common.Traits.Render
if (--ticks <= 0) if (--ticks <= 0)
{ {
wsb.PlayCustomAnimation(self, Info.Sequences.Random(Game.CosmeticRandom), () => wsb.CancelCustomAnimation(self)); wsb.PlayCustomAnimation(self, Info.Sequences.Random(Game.CosmeticRandom));
ticks = Info.Interval; ticks = Info.Interval;
} }
} }

2
OpenRA.Mods.Common/Traits/Render/WithRearmAnimation.cs
View File

@@ -36,7 +36,7 @@ namespace OpenRA.Mods.Common.Traits.Render
void INotifyRearm.Rearming(Actor self, Actor target) void INotifyRearm.Rearming(Actor self, Actor target)
{ {
if (buildComplete && spriteBody != null && !IsTraitDisabled) if (buildComplete && spriteBody != null && !IsTraitDisabled)
spriteBody.PlayCustomAnimation(self, Info.Sequence, () => spriteBody.CancelCustomAnimation(self)); spriteBody.PlayCustomAnimation(self, Info.Sequence);
} }
void INotifyBuildComplete.BuildingComplete(Actor self) void INotifyBuildComplete.BuildingComplete(Actor self)

2
OpenRA.Mods.Common/Traits/Render/WithRepairAnimation.cs
View File

@@ -36,7 +36,7 @@ namespace OpenRA.Mods.Common.Traits.Render
void INotifyRepair.Repairing(Actor self, Actor target) void INotifyRepair.Repairing(Actor self, Actor target)
{ {
if (buildComplete && spriteBody != null && !IsTraitDisabled) if (buildComplete && spriteBody != null && !IsTraitDisabled)
spriteBody.PlayCustomAnimation(self, Info.Sequence, () => spriteBody.CancelCustomAnimation(self)); spriteBody.PlayCustomAnimation(self, Info.Sequence);
} }
void INotifyBuildComplete.BuildingComplete(Actor self) void INotifyBuildComplete.BuildingComplete(Actor self)

4
OpenRA.Mods.Common/Traits/Render/WithSpriteBody.cs
View File

@@ -93,7 +93,7 @@ namespace OpenRA.Mods.Common.Traits.Render
{ {
DefaultAnimation.PlayThen(NormalizeSequence(self, name), () => DefaultAnimation.PlayThen(NormalizeSequence(self, name), () =>
{ {
DefaultAnimation.Play(NormalizeSequence(self, Info.Sequence)); CancelCustomAnimation(self);
if (after != null) if (after != null)
after(); after();
}); });
@@ -109,7 +109,7 @@ namespace OpenRA.Mods.Common.Traits.Render
{ {
DefaultAnimation.PlayBackwardsThen(NormalizeSequence(self, name), () => DefaultAnimation.PlayBackwardsThen(NormalizeSequence(self, name), () =>
{ {
DefaultAnimation.PlayRepeating(NormalizeSequence(self, Info.Sequence)); CancelCustomAnimation(self);
if (after != null) if (after != null)
after(); after();
}); });

2
OpenRA.Mods.Common/Traits/SupportPowers/GrantExternalConditionPower.cs
View File

@@ -63,7 +63,7 @@ namespace OpenRA.Mods.Common.Traits
var wsb = self.TraitOrDefault<WithSpriteBody>(); var wsb = self.TraitOrDefault<WithSpriteBody>();
if (wsb != null && wsb.DefaultAnimation.HasSequence(info.Sequence)) if (wsb != null && wsb.DefaultAnimation.HasSequence(info.Sequence))
wsb.PlayCustomAnimation(self, info.Sequence, () => wsb.CancelCustomAnimation(self)); wsb.PlayCustomAnimation(self, info.Sequence);
Game.Sound.Play(SoundType.World, info.OnFireSound, self.World.Map.CenterOfCell(order.TargetLocation)); Game.Sound.Play(SoundType.World, info.OnFireSound, self.World.Map.CenterOfCell(order.TargetLocation));

2
OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs
View File

@@ -106,7 +106,7 @@ namespace OpenRA.Mods.Common.Traits
if (!string.IsNullOrEmpty(info.ActivationSequence)) if (!string.IsNullOrEmpty(info.ActivationSequence))
{ {
var wsb = self.Trait<WithSpriteBody>(); var wsb = self.Trait<WithSpriteBody>();
wsb.PlayCustomAnimation(self, info.ActivationSequence, () => wsb.CancelCustomAnimation(self)); wsb.PlayCustomAnimation(self, info.ActivationSequence);
} }
var targetPosition = self.World.Map.CenterOfCell(order.TargetLocation); var targetPosition = self.World.Map.CenterOfCell(order.TargetLocation);