From a75f8f63be25ad8b6b8d98cf4a83b778c8a0fea3 Mon Sep 17 00:00:00 2001
From: Pavel Penev <penev92@gmail.com>
Date: Fri, 31 Jul 2015 05:11:04 +0300
Subject: [PATCH] Add an upgrade rule for `BuildableInfo.ForceRace` rename

---
 OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs | 7 +++++++
 mods/cnc/rules/structures.yaml                     | 4 ++--
 mods/d2k/rules/structures.yaml                     | 6 +++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
index b8b03906fd..c7cb371426 100644
--- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
@@ -1671,6 +1671,13 @@ namespace OpenRA.Mods.Common.UtilityCommands
 						if (raceNode != null)
 							raceNode.Key = "Factions";
 					}
+
+					if (node.Key.StartsWith("Buildable"))
+					{
+						var raceNode = node.Value.Nodes.FirstOrDefault(x => x.Key == "ForceRace");
+						if (raceNode != null)
+							raceNode.Key = "ForceFaction";
+					}
 				}
 
 				UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1);
diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml
index 970cdbb171..44861f0a3b 100644
--- a/mods/cnc/rules/structures.yaml
+++ b/mods/cnc/rules/structures.yaml
@@ -78,7 +78,7 @@ FACT.GDI:
 		Queue: Building.GDI, Building.Nod
 		BuildPaletteOrder: 1000
 		Prerequisites: ~disabled
-		ForceRace: gdi
+		ForceFaction: gdi
 	Tooltip:
 		Name: Construction Yard (GDI)
 
@@ -90,7 +90,7 @@ FACT.NOD:
 		Queue: Building.GDI, Building.Nod
 		BuildPaletteOrder: 1000
 		Prerequisites: ~disabled
-		ForceRace: nod
+		ForceFaction: nod
 	Tooltip:
 		Name: Construction Yard (Nod)
 
diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml
index e6f232eb3d..91270d1dd4 100644
--- a/mods/d2k/rules/structures.yaml
+++ b/mods/d2k/rules/structures.yaml
@@ -846,7 +846,7 @@ conyard.atreides:
 		Queue: Building
 		BuildPaletteOrder: 1000
 		Prerequisites: ~disabled
-		ForceRace: atreides
+		ForceFaction: atreides
 	RenderBuilding:
 		Image: conyard.atreides
 		-RaceImages:
@@ -857,7 +857,7 @@ conyard.harkonnen:
 		Queue: Building
 		BuildPaletteOrder: 1000
 		Prerequisites: ~disabled
-		ForceRace: harkonnen
+		ForceFaction: harkonnen
 	RenderBuilding:
 		Image: conyard.harkonnen
 		-RaceImages:
@@ -868,7 +868,7 @@ conyard.ordos:
 		Queue: Building
 		BuildPaletteOrder: 1000
 		Prerequisites: ~disabled
-		ForceRace: ordos
+		ForceFaction: ordos
 	RenderBuilding:
 		Image: conyard.ordos
 		-RaceImages: