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

Implement IRenderInfantrySequenceModifier for ScaredyCat and TakeCover

Browse Source
This commit is contained in:
Curtis Shmyr
2014-08-23 14:42:55 -06:00
parent 345e88d75a
commit fa8229d53b
16 changed files with 147 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,12 +12,12 @@ using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
{
class RenderDisguiseInfo : RenderInfantryProneInfo, Requires<DisguiseInfo>
class RenderDisguiseInfo : RenderInfantryInfo, Requires<DisguiseInfo>
{
public override object Create(ActorInitializer init) { return new RenderDisguise(init.self, this); }
}
class RenderDisguise : RenderInfantryProne
class RenderDisguise : RenderInfantry
{
RenderDisguiseInfo info;
string intendedSprite;

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

@@ -50,48 +50,47 @@ namespace OpenRA.Mods.RA.Render
public class RenderInfantry : RenderSimple, INotifyAttack, INotifyKilled, INotifyIdle
{
public enum AnimationState
{
Idle,
Attacking,
Moving,
Waiting,
IdleAnimating
}
IMove move;
RenderInfantryInfo info;
public bool IsMoving { get; set; }
protected bool dirty = false;
readonly RenderInfantryInfo info;
readonly IMove move;
bool dirty = false;
string idleSequence;
int idleDelay;
AnimationState state;
protected virtual string NormalizeInfantrySequence(Actor self, string baseSequence)
{
return baseSequence;
}
protected virtual bool AllowIdleAnimation(Actor self)
{
return info.IdleAnimations.Length > 0;
}
public AnimationState State { get; private set; }
IRenderInfantrySequenceModifier rsm;
bool isModifyingSequence { get { return rsm != null && rsm.IsModifyingSequence; } }
bool wasModifying;
public RenderInfantry(Actor self, RenderInfantryInfo info)
: base(self, MakeFacingFunc(self))
{
this.info = info;
DefaultAnimation.PlayFetchIndex(NormalizeInfantrySequence(self, info.StandAnimations.Random(Game.CosmeticRandom)), () => 0);
State = AnimationState.Waiting;
state = AnimationState.Waiting;
move = self.Trait<IMove>();
rsm = self.TraitOrDefault<IRenderInfantrySequenceModifier>();
}
protected virtual string NormalizeInfantrySequence(Actor self, string baseSequence)
{
var prefix = isModifyingSequence ? rsm.SequencePrefix : "";
if (DefaultAnimation.HasSequence(prefix + baseSequence))
return prefix + baseSequence;
else
return baseSequence;
}
protected virtual bool AllowIdleAnimation(Actor self)
{
return info.IdleAnimations.Length > 0 && !isModifyingSequence;
}
public void Attacking(Actor self, Target target)
{
State = AnimationState.Attacking;
state = AnimationState.Attacking;
if (DefaultAnimation.HasSequence(NormalizeInfantrySequence(self, info.AttackAnimation)))
DefaultAnimation.PlayThen(NormalizeInfantrySequence(self, info.AttackAnimation), () => State = AnimationState.Idle);
DefaultAnimation.PlayThen(NormalizeInfantrySequence(self, info.AttackAnimation), () => state = AnimationState.Idle);
}
public void Attacking(Actor self, Target target, Armament a, Barrel barrel)
@@ -103,14 +102,22 @@ namespace OpenRA.Mods.RA.Render
{
base.Tick(self);
if ((State == AnimationState.Moving || dirty) && !move.IsMoving)
if (rsm != null)
{
State = AnimationState.Waiting;
if (wasModifying != rsm.IsModifyingSequence)
dirty = true;
wasModifying = rsm.IsModifyingSequence;
}
if ((state == AnimationState.Moving || dirty) && !move.IsMoving)
{
state = AnimationState.Waiting;
DefaultAnimation.PlayFetchIndex(NormalizeInfantrySequence(self, info.StandAnimations.Random(Game.CosmeticRandom)), () => 0);
}
else if ((State != AnimationState.Moving || dirty) && move.IsMoving)
else if ((state != AnimationState.Moving || dirty) && move.IsMoving)
{
State = AnimationState.Moving;
state = AnimationState.Moving;
DefaultAnimation.PlayRepeating(NormalizeInfantrySequence(self, info.MoveAnimation));
}
@@ -119,10 +126,10 @@ namespace OpenRA.Mods.RA.Render
public void TickIdle(Actor self)
{
if (State != AnimationState.Idle && State != AnimationState.IdleAnimating)
if (state != AnimationState.Idle && state != AnimationState.IdleAnimating)
{
DefaultAnimation.PlayFetchIndex(NormalizeInfantrySequence(self, info.StandAnimations.Random(Game.CosmeticRandom)), () => 0);
State = AnimationState.Idle;
state = AnimationState.Idle;
if (info.IdleAnimations.Length > 0)
{
@@ -134,11 +141,11 @@ namespace OpenRA.Mods.RA.Render
{
if (DefaultAnimation.HasSequence(idleSequence))
{
State = AnimationState.IdleAnimating;
state = AnimationState.IdleAnimating;
DefaultAnimation.PlayThen(idleSequence, () =>
{
DefaultAnimation.PlayRepeating(NormalizeInfantrySequence(self, info.StandAnimations.Random(Game.CosmeticRandom)));
State = AnimationState.Waiting;
state = AnimationState.Waiting;
});
}
}
@@ -166,5 +173,14 @@ namespace OpenRA.Mods.RA.Render
sequence, info.PlayerPalette + self.Owner.InternalName));
});
}
enum AnimationState
{
Idle,
Attacking,
Moving,
Waiting,
IdleAnimating
}
}
}

56
OpenRA.Mods.RA/Render/RenderInfantryPanic.cs
View File

@@ -1,56 +0,0 @@
#region Copyright & License Information
/*
* Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
{
class RenderInfantryPanicInfo : RenderInfantryInfo, Requires<ScaredyCatInfo>
{
public override object Create(ActorInitializer init) { return new RenderInfantryPanic(init.self, this); }
}
class RenderInfantryPanic : RenderInfantry
{
readonly ScaredyCat sc;
bool wasPanic;
public RenderInfantryPanic(Actor self, RenderInfantryPanicInfo info)
: base(self, info)
{
sc = self.Trait<ScaredyCat>();
}
protected override string NormalizeInfantrySequence(Actor self, string baseSequence)
{
var prefix = sc != null && sc.Panicking ? "panic-" : "";
if (DefaultAnimation.HasSequence(prefix + baseSequence))
return prefix + baseSequence;
else
return baseSequence;
}
protected override bool AllowIdleAnimation(Actor self)
{
return base.AllowIdleAnimation(self) && !sc.Panicking;
}
public override void Tick (Actor self)
{
if (wasPanic != sc.Panicking)
dirty = true;
wasPanic = sc.Panicking;
base.Tick(self);
}
}
}