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

Rename Bullet Trail to TrailImage

Browse Source
This commit is contained in:
reaperrr
2016-05-28 15:01:46 +02:00
parent e34c8f0650
commit 170fdc89e3
8 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,10 +46,10 @@ namespace OpenRA.Mods.Common.Projectiles
[PaletteReference] public readonly string ShadowPalette = "shadow"; [PaletteReference] public readonly string ShadowPalette = "shadow";
[Desc("Trail animation.")] [Desc("Trail animation.")]
public readonly string Trail = null; public readonly string TrailImage = null;
[SequenceReference("Trail")] public readonly string[] TrailSequences = { "idle" };
[Desc("Loop a randomly chosen sequence of TrailImage from this list while this projectile is moving.")] [Desc("Loop a randomly chosen sequence of TrailImage from this list while this projectile is moving.")]
[SequenceReference("TrailImage")] public readonly string[] TrailSequences = { "idle" };
[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;
@@ -183,10 +183,10 @@ namespace OpenRA.Mods.Common.Projectiles
shouldExplode = true; shouldExplode = true;
} }
if (!string.IsNullOrEmpty(info.Trail) && --smokeTicks < 0) if (!string.IsNullOrEmpty(info.TrailImage) && --smokeTicks < 0)
{ {
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.TrailImage, info.TrailSequences.Random(world.SharedRandom),
trailPalette, false, false, GetEffectiveFacing()))); trailPalette, false, false, GetEffectiveFacing())));
smokeTicks = info.TrailInterval; smokeTicks = info.TrailInterval;

4
mods/cnc/weapons/missiles.yaml
View File

@@ -184,7 +184,7 @@ MammothMissiles:
Image: DRAGON Image: DRAGON
RateOfTurn: 2 RateOfTurn: 2
ContrailLength: 10 ContrailLength: 10
Trail: smokey TrailImage: smokey
Speed: 341 Speed: 341
Warhead@1Dam: SpreadDamage Warhead@1Dam: SpreadDamage
Spread: 683 Spread: 683
@@ -342,7 +342,7 @@ HonestJohn:
Shadow: true Shadow: true
Inaccuracy: 213 Inaccuracy: 213
Image: patriot Image: patriot
Trail: smokey TrailImage: smokey
Speed: 187 Speed: 187
RangeLimit: 35 RangeLimit: 35
Angle: 88 Angle: 88

6
mods/d2k/weapons/debris.yaml
View File

@@ -38,7 +38,7 @@ Debris2:
Angle: 30, 90 Angle: 30, 90
Inaccuracy: 1c256 Inaccuracy: 1c256
Image: shrapnel2 Image: shrapnel2
Trail: bazooka_trail TrailImage: bazooka_trail
TrailPalette: effect75alpha TrailPalette: effect75alpha
TrailInterval: 2 TrailInterval: 2
Warhead@1Dam: SpreadDamage Warhead@1Dam: SpreadDamage
@@ -72,7 +72,7 @@ Debris3:
Angle: 30, 90 Angle: 30, 90
Inaccuracy: 1c256 Inaccuracy: 1c256
Image: shrapnel3 Image: shrapnel3
Trail: large_trail TrailImage: large_trail
TrailPalette: effect75alpha TrailPalette: effect75alpha
TrailInterval: 1 TrailInterval: 1
Warhead@1Dam: SpreadDamage Warhead@1Dam: SpreadDamage
@@ -106,7 +106,7 @@ Debris4:
Angle: 30, 90 Angle: 30, 90
Inaccuracy: 1c256 Inaccuracy: 1c256
Image: shrapnel4 Image: shrapnel4
Trail: large_trail TrailImage: large_trail
TrailPalette: effect75alpha TrailPalette: effect75alpha
TrailInterval: 1 TrailInterval: 1
Warhead@1Dam: SpreadDamage Warhead@1Dam: SpreadDamage

2
mods/d2k/weapons/other.yaml
View File

@@ -265,7 +265,7 @@ SpiceExplosion:
Speed: 50, 75 Speed: 50, 75
Blockable: false Blockable: false
Angle: 60, 90 Angle: 60, 90
Trail: large_trail TrailImage: large_trail
Image: 120mm Image: 120mm
Warhead@1Dam: SpreadDamage Warhead@1Dam: SpreadDamage
Spread: 320 Spread: 320

2
mods/ra/maps/drop-zone-w/weapons.yaml
View File

@@ -41,7 +41,7 @@ SubMissile:
Angle: 62 Angle: 62
Inaccuracy: 2c938 Inaccuracy: 2c938
Image: MISSILE Image: MISSILE
Trail: smokey TrailImage: smokey
ContrailLength: 30 ContrailLength: 30
Warhead: SpreadDamage Warhead: SpreadDamage
Spread: 426 Spread: 426

2
mods/ra/maps/soviet-07/weapons.yaml
View File

@@ -27,7 +27,7 @@ FireballLauncherInterior:
BurstDelay: 20 BurstDelay: 20
Projectile: Bullet Projectile: Bullet
Speed: 204 Speed: 204
Trail: fb2 TrailImage: fb2
Image: FB1 Image: FB1
Warhead@1Dam: SpreadDamage Warhead@1Dam: SpreadDamage
Spread: 213 Spread: 213

4
mods/ra/weapons/missiles.yaml
View File

@@ -258,7 +258,7 @@ SubMissile:
Angle: 165 Angle: 165
Inaccuracy: 2c938 Inaccuracy: 2c938
Image: MISSILE Image: MISSILE
Trail: smokey TrailImage: smokey
ContrailLength: 30 ContrailLength: 30
Warhead@1Dam: SpreadDamage Warhead@1Dam: SpreadDamage
Spread: 426 Spread: 426
@@ -411,7 +411,7 @@ SCUD:
Speed: 170 Speed: 170
Blockable: false Blockable: false
Shadow: false Shadow: false
Trail: smokey TrailImage: smokey
TrailDelay: 5 TrailDelay: 5
Inaccuracy: 213 Inaccuracy: 213
Image: V2 Image: V2

4
mods/ra/weapons/other.yaml
View File

@@ -5,7 +5,7 @@ FireballLauncher:
BurstDelay: 20 BurstDelay: 20
Projectile: Bullet Projectile: Bullet
Speed: 204 Speed: 204
Trail: fb2 TrailImage: fb2
Image: FB1 Image: FB1
Warhead@1Dam: SpreadDamage Warhead@1Dam: SpreadDamage
Spread: 213 Spread: 213
@@ -30,7 +30,7 @@ Flamer:
BurstDelay: 1 BurstDelay: 1
Projectile: Bullet Projectile: Bullet
Speed: 170 Speed: 170
Trail: fb4 TrailImage: fb4
Image: fb3 Image: fb3
Angle: 62 Angle: 62
Inaccuracy: 853 Inaccuracy: 853