From c4ffd49add178bb1e6006618f4d7a22771d29435 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Sun, 24 Jan 2010 16:48:45 +1300
Subject: [PATCH] Fix RulesConverter for aftermath

---
 RulesConverter/Program.cs       |  3 ++-
 mods/aftermath/merge-rules.yaml |  2 ++
 mods/aftermath/rules.yaml       | 38 ++++++++++++++++-----------------
 regen-yaml.cmd                  |  2 +-
 4 files changed, 24 insertions(+), 21 deletions(-)
 create mode 100644 mods/aftermath/merge-rules.yaml

diff --git a/RulesConverter/Program.cs b/RulesConverter/Program.cs
index 40b5bbe649..1f1229b95c 100644
--- a/RulesConverter/Program.cs
+++ b/RulesConverter/Program.cs
@@ -209,7 +209,8 @@ namespace RulesConverter
 			var yaml = MiniYaml.FromFile( outputFile );
 			if( File.Exists( "merge-" + outputFile ) )
 				yaml = MiniYaml.Merge( MiniYaml.FromFile( "merge-" + outputFile ), yaml );
-			yaml.OptimizeInherits( MiniYaml.FromFile( "defaults.yaml" ) );
+			// A hack, but it works
+			yaml.OptimizeInherits( MiniYaml.FromFile( "../ra/defaults.yaml" ) );
 			yaml.WriteToFile( outputFile );
 		}
 
diff --git a/mods/aftermath/merge-rules.yaml b/mods/aftermath/merge-rules.yaml
new file mode 100644
index 0000000000..94d5f1dd97
--- /dev/null
+++ b/mods/aftermath/merge-rules.yaml
@@ -0,0 +1,2 @@
+DTRK:
+	-Chronoshiftable:
\ No newline at end of file
diff --git a/mods/aftermath/rules.yaml b/mods/aftermath/rules.yaml
index 9a0050e92d..24d2ca2fbc 100644
--- a/mods/aftermath/rules.yaml
+++ b/mods/aftermath/rules.yaml
@@ -1,3 +1,22 @@
+DTRK:
+	Inherits: ^Vehicle
+	Buildable:
+		TechLevel: 13
+		Prerequisites: mslo
+		Owner: allies,soviet
+		Cost: 2400
+		Description: Demo Truck
+	Unit:
+		HP: 110
+		Armor: light
+		Sight: 3
+		Speed: 8
+	AttackBase:
+		PrimaryWeapon: Democharge
+	RenderUnit:
+	DemoTruck:
+	-Chronoshiftable:
+
 STNK:
 	Inherits: ^Vehicle
 	Unit:
@@ -55,25 +74,6 @@ CTNK:
 	RenderUnit:
 	ChronoshiftDeploy:
 
-DTRK:
-	Inherits: ^Vehicle
-	Buildable:
-		TechLevel: 13
-		Prerequisites: mslo
-		Owner: allies,soviet
-		Cost: 2400
-		Description: Demo Truck
-	Unit:
-		HP: 110
-		Armor: light
-		Sight: 3
-		Speed: 8
-	AttackBase:
-		PrimaryWeapon: Democharge
-	RenderUnit:
-	-Chronoshiftable:
-	DemoTruck:
-
 QTNK:
 	Inherits: ^Vehicle
 	Buildable:
diff --git a/regen-yaml.cmd b/regen-yaml.cmd
index 99ae91c99e..24c096106b 100755
--- a/regen-yaml.cmd
+++ b/regen-yaml.cmd
@@ -2,5 +2,5 @@ pushd mods\ra\
 ..\..\RulesConverter\bin\debug\RulesConverter.exe units.ini rules.ini trees.ini campaignUnits.ini rules.yaml
 popd
 pushd mods\aftermath\
-RulesConverter\bin\debug\RulesConverter.exe aftermathUnits.ini aftrmath.ini rules.yaml
+..\..\RulesConverter\bin\debug\RulesConverter.exe aftermathUnits.ini aftrmath.ini rules.yaml
 popd
\ No newline at end of file