From 4a71a6746fbe7ffbdfe2bf91edcbf1035a0b23a3 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 11 Apr 2019 19:17:42 +0200 Subject: [PATCH] Group all Bullet Trail* properties together Just a small code readability improvement. --- OpenRA.Mods.Common/Projectiles/Bullet.cs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/OpenRA.Mods.Common/Projectiles/Bullet.cs b/OpenRA.Mods.Common/Projectiles/Bullet.cs index 9ca8e55dc8..bc4f77413f 100644 --- a/OpenRA.Mods.Common/Projectiles/Bullet.cs +++ b/OpenRA.Mods.Common/Projectiles/Bullet.cs @@ -54,6 +54,18 @@ namespace OpenRA.Mods.Common.Projectiles [Desc("Loop a randomly chosen sequence of TrailImage from this list while this projectile is moving.")] [SequenceReference("TrailImage")] public readonly string[] TrailSequences = { "idle" }; + [Desc("Interval in ticks between each spawned Trail animation.")] + public readonly int TrailInterval = 2; + + [Desc("Delay in ticks until trail animation is spawned.")] + public readonly int TrailDelay = 1; + + [Desc("Palette used to render the trail sequence.")] + [PaletteReference("TrailUsePlayerPalette")] public readonly string TrailPalette = "effect"; + + [Desc("Use the Player Palette to render the trail sequence.")] + public readonly bool TrailUsePlayerPalette = false; + [Desc("Is this blocked by actors with BlocksProjectiles trait.")] public readonly bool Blockable = true; @@ -73,21 +85,9 @@ namespace OpenRA.Mods.Common.Projectiles [Desc("If projectile touches an actor with one of these stances during or after the first bounce, trigger explosion.")] public readonly Stance ValidBounceBlockerStances = Stance.Enemy | Stance.Neutral; - [Desc("Interval in ticks between each spawned Trail animation.")] - public readonly int TrailInterval = 2; - - [Desc("Delay in ticks until trail animation is spawned.")] - public readonly int TrailDelay = 1; - [Desc("Altitude above terrain below which to explode. Zero effectively deactivates airburst.")] public readonly WDist AirburstAltitude = WDist.Zero; - [Desc("Palette used to render the trail sequence.")] - [PaletteReference("TrailUsePlayerPalette")] public readonly string TrailPalette = "effect"; - - [Desc("Use the Player Palette to render the trail sequence.")] - public readonly bool TrailUsePlayerPalette = false; - public readonly int ContrailLength = 0; public readonly int ContrailZOffset = 2047; public readonly Color ContrailColor = Color.White;