Fix and enable SA1133, SA1134 style rules.

This commit is contained in:
Paul Chote
2019-05-23 18:43:21 +00:00
committed by abcdefg30
parent fbf9461890
commit 78a70be0d4
214 changed files with 1012 additions and 432 deletions

View File

@@ -82,9 +82,15 @@ namespace OpenRA.Mods.Common.Projectiles
readonly Color color;
readonly WDist speed;
[Sync] WPos headPos;
[Sync] WPos tailPos;
[Sync] WPos target;
[Sync]
WPos headPos;
[Sync]
WPos tailPos;
[Sync]
WPos target;
int length;
int towardsTargetFacing;
int headTicks;

View File

@@ -33,11 +33,13 @@ namespace OpenRA.Mods.Common.Projectiles
[Desc("Image to display.")]
public readonly string Image = null;
[SequenceReference("Image")]
[Desc("Loop a randomly chosen sequence of Image from this list while this projectile is moving.")]
[SequenceReference("Image")] public readonly string[] Sequences = { "idle" };
public readonly string[] Sequences = { "idle" };
[PaletteReference]
[Desc("The palette used to draw this projectile.")]
[PaletteReference] public readonly string Palette = "effect";
public readonly string Palette = "effect";
[Desc("Palette is a player palette BaseName")]
public readonly bool IsPlayerPalette = false;
@@ -45,14 +47,16 @@ namespace OpenRA.Mods.Common.Projectiles
[Desc("Does this projectile have a shadow?")]
public readonly bool Shadow = false;
[PaletteReference]
[Desc("Palette to use for this projectile's shadow if Shadow is true.")]
[PaletteReference] public readonly string ShadowPalette = "shadow";
public readonly string ShadowPalette = "shadow";
[Desc("Trail animation.")]
public readonly string TrailImage = null;
[SequenceReference("TrailImage")]
[Desc("Loop a randomly chosen sequence of TrailImage from this list while this projectile is moving.")]
[SequenceReference("TrailImage")] public readonly string[] TrailSequences = { "idle" };
public readonly string[] TrailSequences = { "idle" };
[Desc("Interval in ticks between each spawned Trail animation.")]
public readonly int TrailInterval = 2;
@@ -60,8 +64,9 @@ namespace OpenRA.Mods.Common.Projectiles
[Desc("Delay in ticks until trail animation is spawned.")]
public readonly int TrailDelay = 1;
[PaletteReference("TrailUsePlayerPalette")]
[Desc("Palette used to render the trail sequence.")]
[PaletteReference("TrailUsePlayerPalette")] public readonly string TrailPalette = "effect";
public readonly string TrailPalette = "effect";
[Desc("Use the Player Palette to render the trail sequence.")]
public readonly bool TrailUsePlayerPalette = false;

View File

@@ -20,21 +20,25 @@ namespace OpenRA.Mods.Common.Projectiles
{
public readonly string Image = null;
[SequenceReference("Image")]
[Desc("Loop a randomly chosen sequence of Image from this list while falling.")]
[SequenceReference("Image")] public readonly string[] Sequences = { "idle" };
public readonly string[] Sequences = { "idle" };
[SequenceReference("Image")]
[Desc("Sequence to play when launched. Skipped if null or empty.")]
[SequenceReference("Image")] public readonly string OpenSequence = null;
public readonly string OpenSequence = null;
[PaletteReference]
[Desc("The palette used to draw this projectile.")]
[PaletteReference] public readonly string Palette = "effect";
public readonly string Palette = "effect";
[Desc("Palette is a player palette BaseName")]
public readonly bool IsPlayerPalette = false;
public readonly bool Shadow = false;
[PaletteReference] public readonly string ShadowPalette = "shadow";
[PaletteReference]
public readonly string ShadowPalette = "shadow";
[Desc("Projectile movement vector per tick (forward, right, up), use negative values for opposite directions.")]
public readonly WVec Velocity = WVec.Zero;

View File

@@ -75,19 +75,23 @@ namespace OpenRA.Mods.Common.Projectiles
[Desc("Impact animation.")]
public readonly string HitAnim = null;
[SequenceReference("HitAnim")]
[Desc("Sequence of impact animation to use.")]
[SequenceReference("HitAnim")] public readonly string HitAnimSequence = "idle";
public readonly string HitAnimSequence = "idle";
[PaletteReference] public readonly string HitAnimPalette = "effect";
[PaletteReference]
public readonly string HitAnimPalette = "effect";
[Desc("Image containing launch effect sequence.")]
public readonly string LaunchEffectImage = null;
[SequenceReference("LaunchEffectImage")]
[Desc("Launch effect sequence to play.")]
[SequenceReference("LaunchEffectImage")] public readonly string LaunchEffectSequence = null;
public readonly string LaunchEffectSequence = null;
[PaletteReference]
[Desc("Palette to use for launch effect.")]
[PaletteReference] public readonly string LaunchEffectPalette = "effect";
public readonly string LaunchEffectPalette = "effect";
public IProjectile Create(ProjectileArgs args)
{

View File

@@ -26,11 +26,13 @@ namespace OpenRA.Mods.Common.Projectiles
[Desc("Name of the image containing the projectile sequence.")]
public readonly string Image = null;
[SequenceReference("Image")]
[Desc("Loop a randomly chosen sequence of Image from this list while this projectile is moving.")]
[SequenceReference("Image")] public readonly string[] Sequences = { "idle" };
public readonly string[] Sequences = { "idle" };
[PaletteReference]
[Desc("Palette used to render the projectile sequence.")]
[PaletteReference] public readonly string Palette = "effect";
public readonly string Palette = "effect";
[Desc("Palette is a player palette BaseName")]
public readonly bool IsPlayerPalette = false;
@@ -101,11 +103,13 @@ namespace OpenRA.Mods.Common.Projectiles
[Desc("Image that contains the trail animation.")]
public readonly string TrailImage = null;
[SequenceReference("TrailImage")]
[Desc("Loop a randomly chosen sequence of TrailImage from this list while this projectile is moving.")]
[SequenceReference("TrailImage")] public readonly string[] TrailSequences = { "idle" };
public readonly string[] TrailSequences = { "idle" };
[PaletteReference("TrailUsePlayerPalette")]
[Desc("Palette used to render the trail sequence.")]
[PaletteReference("TrailUsePlayerPalette")] public readonly string TrailPalette = "effect";
public readonly string TrailPalette = "effect";
[Desc("Use the Player Palette to render the trail sequence.")]
public readonly bool TrailUsePlayerPalette = false;