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

Merge pull request #10856 from reaperrr/smoke-facings

Browse Source 
Added facings support to sprite trails
This commit is contained in:
abcdefg30
2016-03-06 12:18:29 +01:00
parent f23df1170b 717a5063d9
commit b1b4c0bbd4
4 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Effects/Bullet.cs
View File

@@ -47,6 +47,9 @@ namespace OpenRA.Mods.Common.Effects
[Desc("Trail animation.")]
public readonly string Trail = null;
[Desc("Loop these sequences of Trail while this projectile is moving.")]
[SequenceReference("Trail")] public readonly string[] TrailSequences = { "idle" };
[Desc("Is this blocked by actors with BlocksProjectiles trait.")]
public readonly bool Blockable = true;
@@ -179,7 +182,7 @@ namespace OpenRA.Mods.Common.Effects
if (!string.IsNullOrEmpty(info.Trail) && --smokeTicks < 0)
{
var delayedPos = WPos.LerpQuadratic(args.Source, target, angle, ticks - info.TrailDelay, length);
world.AddFrameEndTask(w => w.Add(new Smoke(w, delayedPos, info.Trail, trailPalette, info.Sequences.Random(world.SharedRandom))));
world.AddFrameEndTask(w => w.Add(new Smoke(w, delayedPos, () => GetEffectiveFacing(), info.Trail, trailPalette, info.TrailSequences.Random(world.SharedRandom))));
smokeTicks = info.TrailInterval;
}

2
OpenRA.Mods.Common/Effects/Missile.cs
View File

@@ -805,7 +805,7 @@ namespace OpenRA.Mods.Common.Effects
// Create the smoke trail effect
if (!string.IsNullOrEmpty(info.TrailImage) && --ticksToNextSmoke < 0 && (state != States.Freefall || info.TrailWhenDeactivated))
{
world.AddFrameEndTask(w => w.Add(new Smoke(w, pos - 3 * move / 2, info.TrailImage, trailPalette, info.TrailSequence)));
world.AddFrameEndTask(w => w.Add(new Smoke(w, pos - 3 * move / 2, () => renderFacing, info.TrailImage, trailPalette, info.TrailSequence)));
ticksToNextSmoke = info.TrailInterval;
}

6
OpenRA.Mods.Common/Effects/Smoke.cs
View File

@@ -9,6 +9,7 @@
*/
#endregion
using System;
using System.Collections.Generic;
using OpenRA.Effects;
using OpenRA.Graphics;
@@ -23,12 +24,15 @@ namespace OpenRA.Mods.Common.Effects
readonly string palette;
public Smoke(World world, WPos pos, string trail, string palette, string sequence)
: this(world, pos, () => 0, trail, palette, sequence) { }
public Smoke(World world, WPos pos, Func<int> facingFunc, string trail, string palette, string sequence)
{
this.world = world;
this.pos = pos;
this.palette = palette;
anim = new Animation(world, trail);
anim = new Animation(world, trail, facingFunc);
anim.PlayThen(sequence,
() => world.AddFrameEndTask(w => w.Remove(this)));
}

10
OpenRA.Mods.Common/Traits/SmokeTrailWhenDamaged.cs
View File

@@ -9,6 +9,7 @@
*/
#endregion
using System;
using OpenRA.Mods.Common.Effects;
using OpenRA.Traits;
@@ -31,12 +32,19 @@ namespace OpenRA.Mods.Common.Traits
{
readonly SmokeTrailWhenDamagedInfo info;
readonly BodyOrientation body;
readonly Func<int> getFacing;
int ticks;
public SmokeTrailWhenDamaged(Actor self, SmokeTrailWhenDamagedInfo info)
{
this.info = info;
body = self.Trait<BodyOrientation>();
var facing = self.TraitOrDefault<IFacing>();
if (facing != null)
getFacing = () => facing.Facing;
else
getFacing = () => 0;
}
public void Tick(Actor self)
@@ -48,7 +56,7 @@ namespace OpenRA.Mods.Common.Traits
{
var offset = info.Offset.Rotate(body.QuantizeOrientation(self, self.Orientation));
var pos = position + body.LocalToWorld(offset);
self.World.AddFrameEndTask(w => w.Add(new Smoke(w, pos, info.Sprite, info.Palette, info.Sequence)));
self.World.AddFrameEndTask(w => w.Add(new Smoke(w, pos, getFacing, info.Sprite, info.Palette, info.Sequence)));
}
ticks = info.Interval;