Rename ResourceType trait fields for consistency.

OpenRA.Game/Traits/World/ResourceType.cs

@@ -17,11 +17,12 @@ namespace OpenRA.Traits
 	public class ResourceTypeInfo : ITraitInfo
 	{
 		[Desc("Sequence image that holds the different variants.")]
-		public readonly string Sequence = "resources";
+		public readonly string Image = "resources";
 
-		[SequenceReference("Sequence")]
+		[FieldLoader.Require]
+		[SequenceReference("Image")]
 		[Desc("Randomly chosen image sequences.")]
-		public readonly string[] Variants = { };
+		public readonly string[] Sequences = { };
 
 		[PaletteReference]
 		[Desc("Palette used for rendering the resource sprites.")]
@@ -38,10 +39,15 @@ namespace OpenRA.Traits
 
 		[FieldLoader.Require]
 		[Desc("Resource identifier used by other traits.")]
+		public readonly string Type = null;
+
+		[FieldLoader.Require]
+		[Desc("Resource name used by tooltips.")]
 		public readonly string Name = null;
 
+		[FieldLoader.Require]
 		[Desc("Terrain type used to determine unit movement and minimap colors.")]
-		public readonly string TerrainType = "Ore";
+		public readonly string TerrainType = null;
 
 		[Desc("Terrain types that this resource can spawn on.")]
 		public readonly HashSet<string> AllowedTerrainTypes = new HashSet<string>();
@@ -71,9 +77,9 @@ namespace OpenRA.Traits
 		{
 			Info = info;
 			Variants = new Dictionary<string, Sprite[]>();
-			foreach (var v in info.Variants)
+			foreach (var v in info.Sequences)
 			{
-				var seq = world.Map.Rules.Sequences.GetSequence(Info.Sequence, v);
+				var seq = world.Map.Rules.Sequences.GetSequence(Info.Image, v);
 				var sprites = Exts.MakeArray(seq.Length, x => seq.GetSprite(x));
 				Variants.Add(v, sprites);
 			}