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

Add multiple sequence and upgrade support to LeavesTrails.

Browse Source
This commit is contained in:
Paul Chote
2016-01-02 19:25:26 +00:00
parent 6af377030c
commit adaa1fa70e
1 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
OpenRA.Mods.Common/Traits/Render/LeavesTrails.cs
View File

@@ -18,9 +18,13 @@ namespace OpenRA.Mods.Common.Traits
public enum TrailType { Cell, CenterPosition } public enum TrailType { Cell, CenterPosition }
[Desc("Renders a sprite effect when leaving a cell.")] [Desc("Renders a sprite effect when leaving a cell.")]
public class LeavesTrailsInfo : ITraitInfo public class LeavesTrailsInfo : UpgradableTraitInfo
{ {
public readonly string Image = null; public readonly string Image = null;
[SequenceReference("Image")]
public readonly string[] Sequences = { "idle" };
[PaletteReference] public readonly string Palette = "effect"; [PaletteReference] public readonly string Palette = "effect";
[Desc("Only do so when the terrain types match with the previous cell.")] [Desc("Only do so when the terrain types match with the previous cell.")]
@@ -42,43 +46,47 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Delay between trail updates when moving.")] [Desc("Delay between trail updates when moving.")]
public readonly int MovingInterval = 0; public readonly int MovingInterval = 0;
public object Create(ActorInitializer init) { return new LeavesTrails(this, init.Self); } public override object Create(ActorInitializer init) { return new LeavesTrails(init.Self, this); }
} }
public class LeavesTrails : ITick public class LeavesTrails : UpgradableTrait<LeavesTrailsInfo>, ITick
{ {
readonly LeavesTrailsInfo info; public LeavesTrails(Actor self, LeavesTrailsInfo info)
: base(info) { }
public LeavesTrails(LeavesTrailsInfo info, Actor self)
{
this.info = info;
}
WPos cachedPosition; WPos cachedPosition;
int ticks; int ticks;
public void Tick(Actor self) public void Tick(Actor self)
{ {
var isMoving = self.CenterPosition != cachedPosition; if (IsTraitDisabled)
if ((isMoving && !info.TrailWhileMoving) || (!isMoving && !info.TrailWhileStationary))
return; return;
var interval = isMoving ? info.MovingInterval : var isMoving = self.CenterPosition != cachedPosition;
info.StationaryInterval; if ((isMoving && !Info.TrailWhileMoving) || (!isMoving && !Info.TrailWhileStationary))
return;
var interval = isMoving ? Info.MovingInterval : Info.StationaryInterval;
if (++ticks >= interval) if (++ticks >= interval)
{ {
var cachedCell = self.World.Map.CellContaining(cachedPosition); var cachedCell = self.World.Map.CellContaining(cachedPosition);
var type = self.World.Map.GetTerrainInfo(cachedCell).Type; var type = self.World.Map.GetTerrainInfo(cachedCell).Type;
var pos = info.Type == TrailType.CenterPosition ? cachedPosition : var pos = Info.Type == TrailType.CenterPosition ? cachedPosition :
self.World.Map.CenterOfCell(cachedCell); self.World.Map.CenterOfCell(cachedCell);
if (info.TerrainTypes.Contains(type) && !string.IsNullOrEmpty(info.Image)) if (Info.TerrainTypes.Contains(type) && !string.IsNullOrEmpty(Info.Image))
self.World.AddFrameEndTask(w => w.Add(new SpriteEffect(pos, self.World, info.Image, "idle", info.Palette))); self.World.AddFrameEndTask(w => w.Add(new SpriteEffect(pos, self.World, Info.Image,
Info.Sequences.Random(Game.CosmeticRandom), Info.Palette)));
cachedPosition = self.CenterPosition; cachedPosition = self.CenterPosition;
ticks = 0; ticks = 0;
} }
} }
protected override void UpgradeEnabled(Actor self)
{
cachedPosition = self.CenterPosition;
}
} }
} }