Allow ActorInits to target a specific trait by matching the @ suffix.

OpenRA.Game/Map/ActorInitializer.cs

@@ -43,7 +43,17 @@ namespace OpenRA
 
 		public T GetOrDefault<T>(TraitInfo info) where T : ActorInit
 		{
-			return Dict.GetOrDefault<T>();
+			var inits = Dict.WithInterface<T>();
+
+			// Traits tagged with an instance name prefer inits with the same name.
+			// If a more specific init is not available, fall back to an unnamed init.
+			// If duplicate inits are defined, take the last to match standard yaml override expectations
+			if (info != null && !string.IsNullOrEmpty(info.InstanceName))
+				return inits.LastOrDefault(i => i.InstanceName == info.InstanceName) ??
+					inits.LastOrDefault(i => string.IsNullOrEmpty(i.InstanceName));
+
+			// Untagged traits will only use untagged inits
+			return inits.LastOrDefault(i => string.IsNullOrEmpty(i.InstanceName));
 		}
 
 		public T Get<T>(TraitInfo info) where T : ActorInit
@@ -81,6 +91,16 @@ namespace OpenRA
 	 */
 	public abstract class ActorInit
 	{
+		[FieldLoader.Ignore]
+		public readonly string InstanceName;
+
+		protected ActorInit(string instanceName)
+		{
+			InstanceName = instanceName;
+		}
+
+		protected ActorInit() { }
+
 		public abstract MiniYaml Save();
 	}
 
@@ -88,7 +108,8 @@ namespace OpenRA
 	{
 		protected readonly T value;
 
-		protected ValueActorInit(TraitInfo info, T value) { this.value = value; }
+		protected ValueActorInit(TraitInfo info, T value)
+			: base(info.InstanceName) { this.value = value; }
 
 		protected ValueActorInit(T value) { this.value = value; }
 

OpenRA.Game/Map/ActorReference.cs

@@ -47,14 +47,18 @@ namespace OpenRA
 
 		static ActorInit LoadInit(string initName, MiniYaml initYaml)
 		{
-			var type = Game.ModData.ObjectCreator.FindType(initName + "Init");
+			var initInstance = initName.Split(ActorInfo.TraitInstanceSeparator);
+			var type = Game.ModData.ObjectCreator.FindType(initInstance[0] + "Init");
 			if (type == null)
-				throw new InvalidDataException("Unknown initializer type '{0}Init'".F(initName));
+				throw new InvalidDataException("Unknown initializer type '{0}Init'".F(initInstance[0]));
 
 			var init = (ActorInit)FormatterServices.GetUninitializedObject(type);
+			if (initInstance.Length > 1)
+				type.GetField("InstanceName").SetValue(init, initInstance[1]);
+
 			var loader = type.GetMethod("Initialize", new[] { typeof(MiniYaml) });
 			if (loader == null)
-				throw new InvalidDataException("{0}Init does not define a yaml-assignable type.".F(initName));
+				throw new InvalidDataException("{0}Init does not define a yaml-assignable type.".F(initInstance[0]));
 
 			loader.Invoke(init, new[] { initYaml });
 			return init;
@@ -74,6 +78,9 @@ namespace OpenRA
 
 				var initTypeName = init.GetType().Name;
 				var initName = initTypeName.Substring(0, initTypeName.Length - 4);
+				if (!string.IsNullOrEmpty(init.InstanceName))
+					initName += ActorInfo.TraitInstanceSeparator + init.InstanceName;
+
 				ret.Nodes.Add(new MiniYamlNode(initName, init.Save()));
 			}