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

restore previous sequence after IdleAnimation; apply randomness to idle animation wait

Browse Source
This commit is contained in:
Chris Forbes
2011-01-27 18:36:25 +13:00
parent 0bd466a9e9
commit 8cda9d6d8b
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Mods.RA/IdleAnimation.cs
View File

@@ -15,7 +15,8 @@ namespace OpenRA.Mods.RA
{ {
class IdleAnimationInfo : ITraitInfo, ITraitPrerequisite<RenderInfantryInfo> class IdleAnimationInfo : ITraitInfo, ITraitPrerequisite<RenderInfantryInfo>
{ {
public readonly int IdleWaitTicks = 50; public readonly int MinIdleWaitTicks = 30;
public readonly int MaxIdleWaitTicks = 110;
public readonly string[] Animations = {}; public readonly string[] Animations = {};
public object Create(ActorInitializer init) { return new IdleAnimation(this); } public object Create(ActorInitializer init) { return new IdleAnimation(this); }
} }
@@ -56,7 +57,15 @@ namespace OpenRA.Mods.RA
var ri = self.TraitOrDefault<RenderInfantry>(); var ri = self.TraitOrDefault<RenderInfantry>();
if (ri.anim.HasSequence(sequence)) if (ri.anim.HasSequence(sequence))
ri.anim.PlayThen(sequence, () => state = IdleState.None); {
var previousSequence = ri.anim.CurrentSequence.Name;
ri.anim.PlayThen(sequence,
() =>
{
state = IdleState.None;
ri.anim.PlayRepeating(previousSequence);
});
}
else else
state = IdleState.None; state = IdleState.None;
} }
@@ -69,7 +78,7 @@ namespace OpenRA.Mods.RA
state = IdleState.Waiting; state = IdleState.Waiting;
sequence = Info.Animations.Random(self.World.SharedRandom); sequence = Info.Animations.Random(self.World.SharedRandom);
delay = Info.IdleWaitTicks; delay = self.World.SharedRandom.Next(Info.MinIdleWaitTicks, Info.MaxIdleWaitTicks);
} }
} }
} }