Fix and enable SA1133, SA1134 style rules.

OpenRA.Mods.Common/Traits/World/PaletteFromEmbeddedSpritePalette.cs

@@ -20,7 +20,8 @@ namespace OpenRA.Mods.Common.Traits
 {
 	public class PaletteFromEmbeddedSpritePaletteInfo : ITraitInfo, IProvidesCursorPaletteInfo
 	{
-		[FieldLoader.Require, PaletteDefinition]
+		[PaletteDefinition]
+		[FieldLoader.Require]
 		[Desc("Internal palette name")]
 		public readonly string Name = null;
 

OpenRA.Mods.Common/Traits/World/PaletteFromFile.cs

@@ -19,7 +19,8 @@ namespace OpenRA.Mods.Common.Traits
 	[Desc("Load VGA palette (.pal) registers.")]
 	class PaletteFromFileInfo : ITraitInfo, IProvidesCursorPaletteInfo
 	{
-		[FieldLoader.Require, PaletteDefinition]
+		[PaletteDefinition]
+		[FieldLoader.Require]
 		[Desc("internal palette name")]
 		public readonly string Name = null;
 

OpenRA.Mods.Common/Traits/World/PaletteFromGimpOrJascFile.cs

@@ -21,7 +21,8 @@ namespace OpenRA.Mods.Common.Traits
 	[Desc("Load a GIMP .gpl or JASC .pal palette file. Supports per-color alpha. Index 0 is hardcoded to be fully transparent/invisible.")]
 	class PaletteFromGimpOrJascFileInfo : ITraitInfo
 	{
-		[FieldLoader.Require, PaletteDefinition]
+		[PaletteDefinition]
+		[FieldLoader.Require]
 		[Desc("Palette name used internally.")]
 		public readonly string Name = null;
 

OpenRA.Mods.Common/Traits/World/PaletteFromPaletteWithAlpha.cs

@@ -19,11 +19,13 @@ namespace OpenRA.Mods.Common.Traits
 	[Desc("Create a palette by applying alpha transparency to another palette.")]
 	class PaletteFromPaletteWithAlphaInfo : ITraitInfo
 	{
-		[FieldLoader.Require, PaletteDefinition]
+		[PaletteDefinition]
+		[FieldLoader.Require]
 		[Desc("Internal palette name")]
 		public readonly string Name = null;
 
-		[FieldLoader.Require, PaletteReference]
+		[PaletteReference]
+		[FieldLoader.Require]
 		[Desc("The name of the palette to base off.")]
 		public readonly string BasePalette = null;
 

OpenRA.Mods.Common/Traits/World/PaletteFromPlayerPaletteWithAlpha.cs

@@ -19,12 +19,14 @@ namespace OpenRA.Mods.Common.Traits
 	class PaletteFromPlayerPaletteWithAlphaInfo : ITraitInfo
 	{
 		[FieldLoader.Require]
+		[PaletteDefinition(true)]
 		[Desc("The prefix for the resulting player palettes")]
-		[PaletteDefinition(true)] public readonly string BaseName = null;
+		public readonly string BaseName = null;
 
 		[FieldLoader.Require]
+		[PaletteReference(true)]
 		[Desc("The name of the player palette to base off.")]
-		[PaletteReference(true)] public readonly string BasePalette = null;
+		public readonly string BasePalette = null;
 
 		[Desc("Allow palette modifiers to change the palette.")]
 		public readonly bool AllowModifiers = true;

OpenRA.Mods.Common/Traits/World/PaletteFromPng.cs

@@ -20,7 +20,8 @@ namespace OpenRA.Mods.Common.Traits
 	[Desc("Load a PNG and use its embedded palette.")]
 	class PaletteFromPngInfo : ITraitInfo, IProvidesCursorPaletteInfo
 	{
-		[FieldLoader.Require, PaletteDefinition]
+		[PaletteDefinition]
+		[FieldLoader.Require]
 		[Desc("Internal palette name")]
 		public readonly string Name = null;
 

OpenRA.Mods.Common/Traits/World/PaletteFromRGBA.cs

@@ -19,7 +19,8 @@ namespace OpenRA.Mods.Common.Traits
 	[Desc("Creates a single color palette without any base palette file.")]
 	class PaletteFromRGBAInfo : ITraitInfo
 	{
-		[FieldLoader.Require, PaletteDefinition]
+		[PaletteDefinition]
+		[FieldLoader.Require]
 		[Desc("internal palette name")]
 		public readonly string Name = null;
 

OpenRA.Mods.Common/Traits/World/ShroudPalette.cs

@@ -20,8 +20,9 @@ namespace OpenRA.Mods.Common.Traits
 	[Desc("Adds the hard-coded shroud palette to the game")]
 	class ShroudPaletteInfo : ITraitInfo
 	{
+		[PaletteDefinition]
+		[FieldLoader.Require]
 		[Desc("Internal palette name")]
-		[FieldLoader.Require, PaletteDefinition]
 		public readonly string Name = "shroud";
 
 		[Desc("Palette type")]

OpenRA.Mods.Common/Traits/World/ShroudRenderer.cs

@@ -21,25 +21,35 @@ namespace OpenRA.Mods.Common.Traits
 	public class ShroudRendererInfo : ITraitInfo
 	{
 		public readonly string Sequence = "shroud";
-		[SequenceReference("Sequence")] public readonly string[] ShroudVariants = new[] { "shroud" };
-		[SequenceReference("Sequence")] public readonly string[] FogVariants = new[] { "fog" };
+		[SequenceReference("Sequence")]
+		public readonly string[] ShroudVariants = { "shroud" };
 
-		[PaletteReference] public readonly string ShroudPalette = "shroud";
-		[PaletteReference] public readonly string FogPalette = "fog";
+		[SequenceReference("Sequence")]
+		public readonly string[] FogVariants = { "fog" };
+
+		[PaletteReference]
+		public readonly string ShroudPalette = "shroud";
+
+		[PaletteReference]
+		public readonly string FogPalette = "fog";
 
 		[Desc("Bitfield of shroud directions for each frame. Lower four bits are",
 			"corners clockwise from TL; upper four are edges clockwise from top")]
-		public readonly int[] Index = new[] { 12, 9, 8, 3, 1, 6, 4, 2, 13, 11, 7, 14 };
+		public readonly int[] Index = { 12, 9, 8, 3, 1, 6, 4, 2, 13, 11, 7, 14 };
 
 		[Desc("Use the upper four bits when calculating frame")]
 		public readonly bool UseExtendedIndex = false;
 
+		[SequenceReference("Sequence")]
 		[Desc("Override for source art that doesn't define a fully shrouded tile")]
-		[SequenceReference("Sequence")] public readonly string OverrideFullShroud = null;
+		public readonly string OverrideFullShroud = null;
+
 		public readonly int OverrideShroudIndex = 15;
 
+		[SequenceReference("Sequence")]
 		[Desc("Override for source art that doesn't define a fully fogged tile")]
-		[SequenceReference("Sequence")] public readonly string OverrideFullFog = null;
+		public readonly string OverrideFullFog = null;
+
 		public readonly int OverrideFogIndex = 15;
 
 		public readonly BlendMode ShroudBlend = BlendMode.Alpha;

OpenRA.Mods.Common/Traits/World/SmudgeLayer.cs

@@ -36,11 +36,15 @@ namespace OpenRA.Mods.Common.Traits
 
 		[Desc("Sprite sequence name")]
 		public readonly string SmokeType = "smoke_m";
-		[SequenceReference("SmokeType")] public readonly string SmokeSequence = "idle";
 
-		[PaletteReference] public readonly string SmokePalette = "effect";
+		[SequenceReference("SmokeType")]
+		public readonly string SmokeSequence = "idle";
 
-		[PaletteReference] public readonly string Palette = TileSet.TerrainPaletteInternalName;
+		[PaletteReference]
+		public readonly string SmokePalette = "effect";
+
+		[PaletteReference]
+		public readonly string Palette = TileSet.TerrainPaletteInternalName;
 
 		[FieldLoader.LoadUsing("LoadInitialSmudges")]
 		public readonly Dictionary<CPos, MapSmudge> InitialSmudges;