From a3a62d2c140900cc9ce3f478ad69dc4a1cb1c74e Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Fri, 19 Mar 2010 19:58:46 +1300
Subject: [PATCH] added debug, etc

---
 OpenRA.Game/GameRules/Rules.cs             | 8 ++++++--
 mods/ra-ng/{rules.yaml => crate-drop.yaml} | 0
 mods/ra-ng/mod.yaml                        | 2 +-
 settings-netplay-ra.ini                    | 3 ++-
 4 files changed, 9 insertions(+), 4 deletions(-)
 rename mods/ra-ng/{rules.yaml => crate-drop.yaml} (100%)

diff --git a/OpenRA.Game/GameRules/Rules.cs b/OpenRA.Game/GameRules/Rules.cs
index 6d21833771..df87408ffa 100755
--- a/OpenRA.Game/GameRules/Rules.cs
+++ b/OpenRA.Game/GameRules/Rules.cs
@@ -62,8 +62,12 @@ namespace OpenRA
 				Pair.New<string, Func<string, ProjectileInfo>>("Projectile", _ => new ProjectileInfo()));
 			VoiceInfo = new InfoLoader<VoiceInfo>(
 				Pair.New<string, Func<string, VoiceInfo>>("Voice", _ => new VoiceInfo()));
-	
-			var yamlRules = m.Rules.Reverse().Select(a => MiniYaml.FromFile(a)).Aggregate(MiniYaml.Merge);
+
+			Log.Write("Using rules files: ");
+			foreach (var y in m.Rules)
+				Log.Write(" -- {0}", y);
+
+			var yamlRules = m.Rules.Select(a => MiniYaml.FromFile(a)).Aggregate(MiniYaml.Merge);
 
 			Info = new Dictionary<string, ActorInfo>();
 			foreach( var kv in yamlRules )
diff --git a/mods/ra-ng/rules.yaml b/mods/ra-ng/crate-drop.yaml
similarity index 100%
rename from mods/ra-ng/rules.yaml
rename to mods/ra-ng/crate-drop.yaml
diff --git a/mods/ra-ng/mod.yaml b/mods/ra-ng/mod.yaml
index ee5f5e27d1..53300a2647 100644
--- a/mods/ra-ng/mod.yaml
+++ b/mods/ra-ng/mod.yaml
@@ -5,7 +5,7 @@ Packages:
 LegacyRules:
 
 Rules:
-	mods/ra-ng/rules.yaml
+	mods/ra-ng/crate-drop.yaml
 	mods/ra-ng/defense-queue.yaml
 
 Sequences:
diff --git a/settings-netplay-ra.ini b/settings-netplay-ra.ini
index be73876bc4..55120406f7 100644
--- a/settings-netplay-ra.ini
+++ b/settings-netplay-ra.ini
@@ -1,4 +1,5 @@
 [Settings]
 NetworkHost=localhost
 NetworkPort=1234
-InitialMods=ra
\ No newline at end of file
+InitialMods=ra,ra-ng
+PlayerName=Chris
\ No newline at end of file