From 170fdc89e393c6038e2370abe4907cfc7aee1d6a Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 28 May 2016 15:01:46 +0200 Subject: [PATCH] Rename Bullet Trail to TrailImage --- OpenRA.Mods.Common/Projectiles/Bullet.cs | 8 ++++---- mods/cnc/weapons/missiles.yaml | 4 ++-- mods/d2k/weapons/debris.yaml | 6 +++--- mods/d2k/weapons/other.yaml | 2 +- mods/ra/maps/drop-zone-w/weapons.yaml | 2 +- mods/ra/maps/soviet-07/weapons.yaml | 2 +- mods/ra/weapons/missiles.yaml | 4 ++-- mods/ra/weapons/other.yaml | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/OpenRA.Mods.Common/Projectiles/Bullet.cs b/OpenRA.Mods.Common/Projectiles/Bullet.cs index 95814d95b1..ba1aebdc4a 100644 --- a/OpenRA.Mods.Common/Projectiles/Bullet.cs +++ b/OpenRA.Mods.Common/Projectiles/Bullet.cs @@ -46,10 +46,10 @@ namespace OpenRA.Mods.Common.Projectiles [PaletteReference] public readonly string ShadowPalette = "shadow"; [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.")] + [SequenceReference("TrailImage")] public readonly string[] TrailSequences = { "idle" }; [Desc("Is this blocked by actors with BlocksProjectiles trait.")] public readonly bool Blockable = true; @@ -183,10 +183,10 @@ namespace OpenRA.Mods.Common.Projectiles 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); - 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()))); smokeTicks = info.TrailInterval; diff --git a/mods/cnc/weapons/missiles.yaml b/mods/cnc/weapons/missiles.yaml index 75f5829297..2ff65ff115 100644 --- a/mods/cnc/weapons/missiles.yaml +++ b/mods/cnc/weapons/missiles.yaml @@ -184,7 +184,7 @@ MammothMissiles: Image: DRAGON RateOfTurn: 2 ContrailLength: 10 - Trail: smokey + TrailImage: smokey Speed: 341 Warhead@1Dam: SpreadDamage Spread: 683 @@ -342,7 +342,7 @@ HonestJohn: Shadow: true Inaccuracy: 213 Image: patriot - Trail: smokey + TrailImage: smokey Speed: 187 RangeLimit: 35 Angle: 88 diff --git a/mods/d2k/weapons/debris.yaml b/mods/d2k/weapons/debris.yaml index a689ee70b6..8d809ada5a 100644 --- a/mods/d2k/weapons/debris.yaml +++ b/mods/d2k/weapons/debris.yaml @@ -38,7 +38,7 @@ Debris2: Angle: 30, 90 Inaccuracy: 1c256 Image: shrapnel2 - Trail: bazooka_trail + TrailImage: bazooka_trail TrailPalette: effect75alpha TrailInterval: 2 Warhead@1Dam: SpreadDamage @@ -72,7 +72,7 @@ Debris3: Angle: 30, 90 Inaccuracy: 1c256 Image: shrapnel3 - Trail: large_trail + TrailImage: large_trail TrailPalette: effect75alpha TrailInterval: 1 Warhead@1Dam: SpreadDamage @@ -106,7 +106,7 @@ Debris4: Angle: 30, 90 Inaccuracy: 1c256 Image: shrapnel4 - Trail: large_trail + TrailImage: large_trail TrailPalette: effect75alpha TrailInterval: 1 Warhead@1Dam: SpreadDamage diff --git a/mods/d2k/weapons/other.yaml b/mods/d2k/weapons/other.yaml index 2e87345fef..ac589ddf59 100644 --- a/mods/d2k/weapons/other.yaml +++ b/mods/d2k/weapons/other.yaml @@ -265,7 +265,7 @@ SpiceExplosion: Speed: 50, 75 Blockable: false Angle: 60, 90 - Trail: large_trail + TrailImage: large_trail Image: 120mm Warhead@1Dam: SpreadDamage Spread: 320 diff --git a/mods/ra/maps/drop-zone-w/weapons.yaml b/mods/ra/maps/drop-zone-w/weapons.yaml index a4e8eb126a..3c39f60a4b 100644 --- a/mods/ra/maps/drop-zone-w/weapons.yaml +++ b/mods/ra/maps/drop-zone-w/weapons.yaml @@ -41,7 +41,7 @@ SubMissile: Angle: 62 Inaccuracy: 2c938 Image: MISSILE - Trail: smokey + TrailImage: smokey ContrailLength: 30 Warhead: SpreadDamage Spread: 426 diff --git a/mods/ra/maps/soviet-07/weapons.yaml b/mods/ra/maps/soviet-07/weapons.yaml index d03c74575c..98de71bba4 100644 --- a/mods/ra/maps/soviet-07/weapons.yaml +++ b/mods/ra/maps/soviet-07/weapons.yaml @@ -27,7 +27,7 @@ FireballLauncherInterior: BurstDelay: 20 Projectile: Bullet Speed: 204 - Trail: fb2 + TrailImage: fb2 Image: FB1 Warhead@1Dam: SpreadDamage Spread: 213 diff --git a/mods/ra/weapons/missiles.yaml b/mods/ra/weapons/missiles.yaml index 5cfa0f8dcd..81667cf395 100644 --- a/mods/ra/weapons/missiles.yaml +++ b/mods/ra/weapons/missiles.yaml @@ -258,7 +258,7 @@ SubMissile: Angle: 165 Inaccuracy: 2c938 Image: MISSILE - Trail: smokey + TrailImage: smokey ContrailLength: 30 Warhead@1Dam: SpreadDamage Spread: 426 @@ -411,7 +411,7 @@ SCUD: Speed: 170 Blockable: false Shadow: false - Trail: smokey + TrailImage: smokey TrailDelay: 5 Inaccuracy: 213 Image: V2 diff --git a/mods/ra/weapons/other.yaml b/mods/ra/weapons/other.yaml index 2f9a7f6e42..a35a3b7157 100644 --- a/mods/ra/weapons/other.yaml +++ b/mods/ra/weapons/other.yaml @@ -5,7 +5,7 @@ FireballLauncher: BurstDelay: 20 Projectile: Bullet Speed: 204 - Trail: fb2 + TrailImage: fb2 Image: FB1 Warhead@1Dam: SpreadDamage Spread: 213 @@ -30,7 +30,7 @@ Flamer: BurstDelay: 1 Projectile: Bullet Speed: 170 - Trail: fb4 + TrailImage: fb4 Image: fb3 Angle: 62 Inaccuracy: 853