Merge pull request #3717 from Mailaender/atreides-tech

Fixed unbuildable units in the Dune 2000 tech tree

OpenRA.Mods.RA/Lint/LintBuildablePrerequisites.cs

@@ -20,17 +20,18 @@ namespace OpenRA.Mods.RA
 		public void Run(Action<string> emitError, Action<string> emitWarning)
 		{
 			var providedPrereqs = Rules.Info.Keys.Concat(
-				Rules.Info.SelectMany( a => a.Value.Traits
+				Rules.Info.SelectMany(a => a.Value.Traits
 					.WithInterface<ProvidesCustomPrerequisiteInfo>()
-					.Select( p => p.Prerequisite ))).ToArray();
+					.Select(p => p.Prerequisite))).ToArray();
 
-			foreach( var i in Rules.Info )
+			// TODO: this check is case insensitive while the real check in-game is not
+			foreach (var i in Rules.Info)
 			{
 				var bi = i.Value.Traits.GetOrDefault<BuildableInfo>();
 				if (bi != null)
-					foreach( var prereq in bi.Prerequisites )
-						if ( !providedPrereqs.Contains(prereq.Replace("!","")) )
-							emitError( "Buildable actor {0} has prereq {1} not provided by anything.".F( i.Key, prereq ) );
+					foreach (var prereq in bi.Prerequisites)
+						if (!providedPrereqs.Contains(prereq.Replace("!", "")))
+							emitError("Buildable actor {0} has prereq {1} not provided by anything.".F(i.Key, prereq));
 			}
 		}
 	}

mods/d2k/rules/atreides.yaml

@@ -154,7 +154,7 @@ SONICTANK:
 	Buildable:
 		Queue: Armor
 		BuildPaletteOrder: 100
-		Prerequisites: heavya,research
+		Prerequisites: heavya, researcha
 		Owner: atreides
 		Hotkey: o
 	Valued:

mods/d2k/rules/infantry.yaml

@@ -83,8 +83,8 @@ MEDIC:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 60
-		Owner: atreides,ordos
-		Prerequisites: research
+		Owner: atreides, ordos
+		Prerequisites: Research
 		Hotkey: m
 	Valued:
 		Cost: 500

mods/d2k/rules/ordos.yaml

@@ -231,7 +231,7 @@ DEVIATORTANK:
 	Buildable:
 		Queue: Armor
 		BuildPaletteOrder: 50
-		Prerequisites: heavyo,research
+		Prerequisites: heavyo, researcho
 #		Owner: ordos
 		Hotkey: d
 	Mobile: