remove spurious IProducer interface; add IBlocksBullets and move Wall

OpenRA.Game/Effects/Bullet.cs

@@ -101,7 +101,7 @@ namespace OpenRA.Effects
 				var cell = ((1f/Game.CellSize) * pos).ToInt2();
 
 				if (world.WorldActor.traits.Get<UnitInfluence>().GetUnitsAt(cell).Any(
-					a => a.traits.Contains<Wall>()))
+					a => a.traits.Contains<IBlocksBullets>()))
 				{
 					Args.dest = pos.ToInt2();
 					Explode(world);

OpenRA.Game/Effects/Missile.cs

@@ -116,7 +116,7 @@ namespace OpenRA.Effects
 				var cell = ((1f / Game.CellSize) * Pos).ToInt2();
 
 				if (world.WorldActor.traits.Get<UnitInfluence>().GetUnitsAt(cell).Any(
-					a => a.traits.Contains<Wall>()))
+					a => a.traits.Contains<IBlocksBullets>()))
 					Explode(world);
 			}
 		}

OpenRA.Game/OpenRA.Game.csproj

@@ -215,7 +215,6 @@
     <Compile Include="Widgets\WorldTooltipWidget.cs" />
     <Compile Include="World.cs" />
     <Compile Include="WorldUtils.cs" />
-    <Compile Include="Traits\Wall.cs" />
     <Compile Include="Traits\Player\EvaAlerts.cs" />
     <Compile Include="Traits\World\ScreenShaker.cs" />
     <Compile Include="Traits\LineBuild.cs" />

OpenRA.Game/Traits/Player/ProductionQueue.cs

@@ -193,7 +193,7 @@ namespace OpenRA.Traits
 				return;
 			}
 
-			if( producer.traits.WithInterface<IProducer>().Any( p => p.Produce( producer, newUnitType ) ) )
+			if( producer.traits.WithInterface<Production>().Any( p => p.Produce( producer, newUnitType ) ) )
 				FinishProduction( newUnitType.Category );
 		}
 	}

OpenRA.Game/Traits/Production.cs

@@ -34,7 +34,7 @@ namespace OpenRA.Traits
 		public virtual object Create(Actor self) { return new Production(self); }
 	}
 
-	public class Production : IIssueOrder, IResolveOrder, IProducer, ITags
+	public class Production : IIssueOrder, IResolveOrder, ITags
 	{
 		bool isPrimary = false;
 		public bool IsPrimary { get { return isPrimary; } }

OpenRA.Game/Traits/TraitsInterfaces.cs

@@ -62,11 +62,6 @@ namespace OpenRA.Traits
 
 	public interface IDisable { bool Disabled { get; } }
 	
-	interface IProducer
-	{
-		bool Produce( Actor self, ActorInfo producee );
-		void SetPrimaryProducer(Actor self, bool isPrimary);
-	}
 	public interface IOccupySpace { IEnumerable<int2> OccupiedCells(); }
 	public interface INotifyAttack { void Attacking(Actor self); }
 	public interface IRenderModifier { IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r); }
@@ -144,4 +139,5 @@ namespace OpenRA.Traits
 	public interface INotifyIdle { void Idle(Actor self); }
 
 	public interface IVictoryConditions { bool HasLost { get; } bool HasWon { get; } }
+	public interface IBlocksBullets { }
 }

OpenRA.Mods.RA/OpenRA.Mods.RA.csproj

@@ -173,6 +173,7 @@
     <Compile Include="ThrowsParticles.cs" />
     <Compile Include="TraitsInterfaces.cs" />
     <Compile Include="DefaultShellmapScript.cs" />
+    <Compile Include="Wall.cs" />
     <Compile Include="WaterPaletteRotation.cs" />
     <Compile Include="WithMuzzleFlash.cs" />
     <Compile Include="WithShadow.cs" />

OpenRA.Mods.RA/Wall.cs

@@ -21,8 +21,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.GameRules;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
 {
 	public class WallInfo : ITraitInfo
 	{
@@ -31,7 +32,7 @@ namespace OpenRA.Traits
 		public object Create(Actor self) { return new Wall(self); }
 	}
 
-	public class Wall : ICrushable, IOccupySpace
+	public class Wall : ICrushable, IOccupySpace, IBlocksBullets
 	{
 		readonly Actor self;
 		public Wall(Actor self)