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

Add support for multiple stand animations.

Browse Source
This commit is contained in:
Paul Chote
2013-10-25 20:11:55 +13:00
parent d0c5ab0ca3
commit ae86e20bc7
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.RA/Render/RenderInfantry.cs
View File

@@ -20,6 +20,7 @@ namespace OpenRA.Mods.RA.Render
public readonly int MinIdleWaitTicks = 30; public readonly int MinIdleWaitTicks = 30;
public readonly int MaxIdleWaitTicks = 110; public readonly int MaxIdleWaitTicks = 110;
public readonly string[] IdleAnimations = { }; public readonly string[] IdleAnimations = { };
public readonly string[] StandAnimations = { "stand" };
public override object Create(ActorInitializer init) { return new RenderInfantry(init.self, this); } public override object Create(ActorInitializer init) { return new RenderInfantry(init.self, this); }
} }
@@ -58,7 +59,7 @@ namespace OpenRA.Mods.RA.Render
: base(self, MakeFacingFunc(self)) : base(self, MakeFacingFunc(self))
{ {
this.info = info; this.info = info;
anim.PlayFetchIndex(NormalizeInfantrySequence(self, "stand"), () => 0); anim.PlayFetchIndex(NormalizeInfantrySequence(self, info.StandAnimations.Random(Game.CosmeticRandom)), () => 0);
State = AnimationState.Waiting; State = AnimationState.Waiting;
mobile = self.Trait<Mobile>(); mobile = self.Trait<Mobile>();
@@ -86,7 +87,7 @@ namespace OpenRA.Mods.RA.Render
if ((State == AnimationState.Moving || dirty) && !mobile.IsMoving) if ((State == AnimationState.Moving || dirty) && !mobile.IsMoving)
{ {
State = AnimationState.Waiting; State = AnimationState.Waiting;
anim.PlayFetchIndex(NormalizeInfantrySequence(self, "stand"), () => 0); anim.PlayFetchIndex(NormalizeInfantrySequence(self, info.StandAnimations.Random(Game.CosmeticRandom)), () => 0);
} }
else if ((State != AnimationState.Moving || dirty) && mobile.IsMoving) else if ((State != AnimationState.Moving || dirty) && mobile.IsMoving)
{ {
@@ -101,7 +102,7 @@ namespace OpenRA.Mods.RA.Render
{ {
if (State != AnimationState.Idle && State != AnimationState.IdleAnimating) if (State != AnimationState.Idle && State != AnimationState.IdleAnimating)
{ {
anim.PlayFetchIndex(NormalizeInfantrySequence(self, "stand"), () => 0); anim.PlayFetchIndex(NormalizeInfantrySequence(self, info.StandAnimations.Random(Game.CosmeticRandom)), () => 0);
State = AnimationState.Idle; State = AnimationState.Idle;
if (info.IdleAnimations.Length > 0) if (info.IdleAnimations.Length > 0)
@@ -117,7 +118,7 @@ namespace OpenRA.Mods.RA.Render
State = AnimationState.IdleAnimating; State = AnimationState.IdleAnimating;
anim.PlayThen(idleSequence, () => anim.PlayThen(idleSequence, () =>
{ {
anim.PlayRepeating(NormalizeInfantrySequence(self, "stand")); anim.PlayRepeating(NormalizeInfantrySequence(self, info.StandAnimations.Random(Game.CosmeticRandom)));
State = AnimationState.Waiting; State = AnimationState.Waiting;
}); });
} }

4
OpenRA.Mods.RA/Render/RenderSpy.cs
View File

@@ -46,9 +46,9 @@ namespace OpenRA.Mods.RA.Render
{ {
disguisedAsSprite = spy.disguisedAsSprite; disguisedAsSprite = spy.disguisedAsSprite;
if (disguisedAsSprite != null) if (disguisedAsSprite != null)
anim.ChangeImage(disguisedAsSprite, "stand"); anim.ChangeImage(disguisedAsSprite, info.StandAnimations.Random(Game.CosmeticRandom));
else else
anim.ChangeImage(GetImage(self), "stand"); anim.ChangeImage(GetImage(self), info.StandAnimations.Random(Game.CosmeticRandom));
UpdatePalette(); UpdatePalette();
} }
base.Tick(self); base.Tick(self);