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

Bullet style and description fixes

Browse Source
This commit is contained in:
reaperrr
2016-05-28 15:01:28 +02:00
parent fef4f3eb79
commit e34c8f0650
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Projectiles/Bullet.cs
View File

@@ -33,7 +33,7 @@ namespace OpenRA.Mods.Common.Projectiles
[Desc("Image to display.")] [Desc("Image to display.")]
public readonly string Image = null; public readonly string Image = null;
[Desc("Loop these sequences of Image while this projectile is moving.")] [Desc("Loop a randomly chosen sequence of Image from this list while this projectile is moving.")]
[SequenceReference("Image")] public readonly string[] Sequences = { "idle" }; [SequenceReference("Image")] public readonly string[] Sequences = { "idle" };
[Desc("The palette used to draw this projectile.")] [Desc("The palette used to draw this projectile.")]
@@ -48,8 +48,8 @@ namespace OpenRA.Mods.Common.Projectiles
[Desc("Trail animation.")] [Desc("Trail animation.")]
public readonly string Trail = null; public readonly string Trail = null;
[Desc("Loop these sequences of Trail while this projectile is moving.")]
[SequenceReference("Trail")] public readonly string[] TrailSequences = { "idle" }; [SequenceReference("Trail")] public readonly string[] TrailSequences = { "idle" };
[Desc("Loop a randomly chosen sequence of TrailImage from this list while this projectile is moving.")]
[Desc("Is this blocked by actors with BlocksProjectiles trait.")] [Desc("Is this blocked by actors with BlocksProjectiles trait.")]
public readonly bool Blockable = true; public readonly bool Blockable = true;
@@ -69,7 +69,10 @@ namespace OpenRA.Mods.Common.Projectiles
[Desc("Delay in ticks until trail animation is spawned.")] [Desc("Delay in ticks until trail animation is spawned.")]
public readonly int TrailDelay = 1; public readonly int TrailDelay = 1;
[Desc("Palette used to render the trail sequence.")]
[PaletteReference("TrailUsePlayerPalette")] public readonly string TrailPalette = "effect"; [PaletteReference("TrailUsePlayerPalette")] public readonly string TrailPalette = "effect";
[Desc("Use the Player Palette to render the trail sequence.")]
public readonly bool TrailUsePlayerPalette = false; public readonly bool TrailUsePlayerPalette = false;
public readonly int ContrailLength = 0; public readonly int ContrailLength = 0;
@@ -185,6 +188,7 @@ namespace OpenRA.Mods.Common.Projectiles
var delayedPos = WPos.LerpQuadratic(args.Source, target, angle, ticks - info.TrailDelay, length); var delayedPos = WPos.LerpQuadratic(args.Source, target, angle, ticks - info.TrailDelay, length);
world.AddFrameEndTask(w => w.Add(new SpriteEffect(delayedPos, w, info.Trail, info.TrailSequences.Random(world.SharedRandom), world.AddFrameEndTask(w => w.Add(new SpriteEffect(delayedPos, w, info.Trail, info.TrailSequences.Random(world.SharedRandom),
trailPalette, false, false, GetEffectiveFacing()))); trailPalette, false, false, GetEffectiveFacing())));
smokeTicks = info.TrailInterval; smokeTicks = info.TrailInterval;
} }