Complete? the rebase.

OpenRA.Game/Graphics/WorldRenderer.cs

@@ -34,7 +34,7 @@ public sealed class WorldRenderer : IDisposable
 		readonly HashSet<Actor> onScreenActors = new HashSet<Actor>();
 		readonly HardwarePalette palette = new HardwarePalette();
 		readonly Dictionary<string, PaletteReference> palettes = new Dictionary<string, PaletteReference>();
-		readonly TerrainRenderer terrainRenderer;
+		readonly IRenderTerrain terrainRenderer;
 		readonly Lazy<DebugVisualizations> debugVis;
 		readonly Func<string, PaletteReference> createPaletteReference;
 		readonly bool enableDepthBuffer;

OpenRA.Mods.Cnc/Activities/LayMines.cs

@@ -109,7 +109,7 @@ Activity IDockActivity.ApproachDockActivities(Actor host, Actor client, Dock doc
 		Activity IDockActivity.DockActivities(Actor host, Actor client, Dock dock)
 		{
 			return ActivityUtils.SequenceActivities(
-				new Rearm(client),
+				new Rearm(client, host, new WDist(512)),
 				new Repair(client, host, new WDist(512)));
 		}
 

OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj

@@ -66,7 +66,6 @@
     <Compile Include="CncLoadScreen.cs" />
     <Compile Include="Traits\EdibleByLeap.cs" />
     <Compile Include="Traits\Attack\AttackPopupTurreted.cs" />
-    <Compile Include="Traits\AttackPopupTurreted.cs" />
     <Compile Include="Traits\Buildings\ProductionAirdrop.cs" />
     <Compile Include="Traits\Infiltration\InfiltrateForTransform.cs" />
     <Compile Include="Traits\Render\WithGunboatBody.cs" />

OpenRA.Mods.Cnc/Traits/Disguise.cs

@@ -15,6 +15,7 @@
 using System.Linq;
 using OpenRA.Mods.Common.Orders;
 using OpenRA.Mods.Common.Traits;
+using OpenRA.Mods.Common.Traits.Render;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 

OpenRA.Mods.Cnc/Traits/TDGunboat.cs

@@ -206,7 +206,7 @@ public bool CanEnterTargetNow(Actor self, Target target)
 			return false;
 		}
 
-		bool IMove.TurnWhileDisabled(Actor self)
+		public bool TurnWhileDisabled(Actor self)
 		{
 			return false;
 		}

OpenRA.Mods.Common/Activities/Air/HeliReturnToBase.cs

@@ -41,7 +41,7 @@ IEnumerable<Actor> GetHelipads(Actor self)
 		{
 			return self.World.ActorsHavingTrait<DockManager>().Where(a =>
 				a.Owner == self.Owner &&
-				aircraft.Info.RearmBuildings.Contains(a.Info.Name) &&
+				rearmable.Info.RearmActors.Contains(a.Info.Name) &&
 				!a.IsDead &&
 				!a.Disposed);
 		}
@@ -97,9 +97,6 @@ public override Activity Tick(Actor self)
 					NextActivity);
 			}
 
-			if (aircraft.Info.TurnToDock)
-				landingProcedures.Add(new Turn(self, initialFacing));
-
 			// Do we need to land and reload/repair?
 			if (!ShouldLandAtBuilding(self, dest))
 			{

OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs

@@ -40,9 +40,9 @@ public ReturnToBase(Actor self, bool abortOnResupply, Actor dest = null, bool al
 
 		public static IEnumerable<Actor> GetAirfields(Actor self)
 		{
-			var rearmBuildings = self.Info.TraitInfo<AircraftInfo>().RearmBuildings;
+			var rearmActors = self.Info.TraitInfo<RearmableInfo>().RearmActors;
 			return self.World.ActorsHavingTrait<DockManager>()
-				.Where(a => a.Owner == self.Owner && rearmBuildings.Contains(a.Info.Name));
+				.Where(a => a.Owner == self.Owner && rearmActors.Contains(a.Info.Name));
 		}
 
 		int CalculateTurnRadius(int speed)
@@ -53,7 +53,7 @@ int CalculateTurnRadius(int speed)
 		void CalculateLandingPath(Actor self, Dock dock, out WPos w1, out WPos w2, out WPos w3)
 		{
 			var landPos = dock.CenterPosition;
-			var altitude = aircraftInfo.CruiseAltitude.Length;
+			var altitude = aircraft.Info.CruiseAltitude.Length;
 
 			// Distance required for descent.
 			var landDistance = altitude * 1024 / aircraft.Info.MaximumPitch.Tan();
@@ -63,7 +63,7 @@ void CalculateLandingPath(Actor self, Dock dock, out WPos w1, out WPos w2, out W
 
 			// Add 10% to the turning radius to ensure we have enough room
 			var speed = aircraft.MovementSpeed * 32 / 35;
-			var turnRadius = CalculateTurnRadius(aircraftInfo, speed);
+			var turnRadius = CalculateTurnRadius(speed);
 
 			// Find the center of the turning circles for clockwise and counterclockwise turns
 			var angle = WAngle.FromFacing(aircraft.Facing);
@@ -168,7 +168,7 @@ public Activity LandingProcedure(Actor self, Dock dock)
 
 			List<Activity> landingProcedures = new List<Activity>();
 
-			var turnRadius = CalculateTurnRadius(aircraft.Info, aircraft.Info.Speed);
+			var turnRadius = CalculateTurnRadius(aircraft.Info.Speed);
 
 			landingProcedures.Add(new Fly(self, Target.FromPos(w1), WDist.Zero, new WDist(turnRadius * 3)));
 			landingProcedures.Add(new Fly(self, Target.FromPos(w2)));

OpenRA.Mods.Common/Activities/Transform.cs

@@ -9,6 +9,7 @@
  */
 #endregion
 
+using System.Linq;
 using OpenRA.Activities;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.Common.Traits.Render;

OpenRA.Mods.Common/OpenRA.Mods.Common.csproj

@@ -156,7 +156,6 @@
     <Compile Include="Effects\SpriteEffect.cs" />
     <Compile Include="Graphics\RailgunRenderable.cs" />
     <Compile Include="Lint\CheckNotifications.cs" />
-    <Compile Include="Effects\LaunchEffect.cs" />
     <Compile Include="Orders\EnterSharedTransportTargeter.cs" />
     <Compile Include="Projectiles\AreaBeam.cs" />
     <Compile Include="Projectiles\Bullet.cs" />
@@ -212,7 +211,6 @@
     <Compile Include="ActorInitializer.cs" />
     <Compile Include="Projectiles\Railgun.cs" />
     <Compile Include="Scripting\Properties\AmmoPoolProperties.cs" />
-    <Compile Include="Scripting\Properties\HackyAIProperties.cs" />
     <Compile Include="Scripting\Properties\RepairableProperties.cs" />
     <Compile Include="ShroudExts.cs" />
     <Compile Include="Orders\BeaconOrderGenerator.cs" />

OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs

@@ -110,7 +110,7 @@ IEnumerable<Order> InnerOrder(World world, CPos cell, MouseInput mi)
 			{
 				var orderType = "PlaceBuilding";
 				var topLeft = viewport.ViewToWorld(Viewport.LastMousePos + topLeftScreenOffset);
-				var cannotBuildAudio = buildableInfo.CannotBuildAudio != null ? buildableInfo.CannotBuildAudio : queue.Info.CannotPlaceNotification;
+				var cannotBuildAudio = buildableInfo.CannotBuildAudio != null ? buildableInfo.CannotBuildAudio : queue.Info.CannotBuildAudio;
 
 				var plugInfo = actorInfo.TraitInfoOrDefault<PlugInfo>();
 				if (plugInfo != null)
@@ -125,7 +125,7 @@ IEnumerable<Order> InnerOrder(World world, CPos cell, MouseInput mi)
 				else
 				{
 					if (!world.CanPlaceBuilding(topLeft, actorInfo, buildingInfo, null)
-						|| !buildingInfo.IsCloseEnoughToBase(world, owner, actorInfo, topLeft))
+						|| !buildingInfo.IsCloseEnoughToBase(world, owner, actorInfo, queue.Actor, topLeft))
 					{
 						foreach (var order in ClearBlockersOrders(world, topLeft))
 							yield return order;
@@ -201,9 +201,9 @@ public IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world)
 
 				if (!Game.GetModifierKeys().HasModifier(Modifiers.Shift))
 					foreach (var t in BuildingUtils.GetLineBuildCells(world, topLeft, actorInfo, buildingInfo))
-						cells.Add(t.First, MakeCellType(buildingInfo.IsCloseEnoughToBase(world, world.LocalPlayer, actorInfo, t.First), true));
+						cells.Add(t.First, MakeCellType(buildingInfo.IsCloseEnoughToBase(world, world.LocalPlayer, actorInfo, queue.Actor, t.First), true));
 
-				cells[topLeft] = MakeCellType(buildingInfo.IsCloseEnoughToBase(world, world.LocalPlayer, actorInfo, topLeft));
+				cells[topLeft] = MakeCellType(buildingInfo.IsCloseEnoughToBase(world, world.LocalPlayer, actorInfo, queue.Actor, topLeft));
 			}
 			else
 			{
@@ -235,7 +235,7 @@ public IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world)
 					yield return r;
 
 				var res = world.WorldActor.TraitOrDefault<ResourceLayer>();
-				var isCloseEnough = buildingInfo.IsCloseEnoughToBase(world, world.LocalPlayer, actorInfo, topLeft);
+				var isCloseEnough = buildingInfo.IsCloseEnoughToBase(world, world.LocalPlayer, actorInfo, queue.Actor, topLeft);
 				foreach (var t in buildingInfo.Tiles(topLeft))
 					cells.Add(t, MakeCellType(isCloseEnough && world.IsCellBuildable(t, actorInfo, buildingInfo) && (res == null || res.GetResource(t) == null)));
 			}

OpenRA.Mods.Common/Traits/Air/Aircraft.cs

@@ -53,10 +53,6 @@ public class AircraftInfo : ITraitInfo, IPositionableInfo, IFacingInfo, IMoveInf
 		[Desc("Can the actor be ordered to move in to shroud?")]
 		public readonly bool MoveIntoShroud = true;
 
-		public virtual object Create(ActorInitializer init) { return new Aircraft(init, this); }
-		public int GetInitialFacing() { return InitialFacing; }
-		public WDist GetCruiseAltitude() { return CruiseAltitude; }
-
 		[VoiceReference] public readonly string Voice = "Action";
 
 		[GrantedConditionReference]
@@ -366,8 +362,11 @@ public Actor GetSupplierActorBelow()
 			if (self.World.Map.DistanceAboveTerrain(CenterPosition).Length != 0)
 				return null; // not on the ground.
 
+			if (rearmableInfo == null && repairableInfo == null)
+				return null;
+
 			return self.World.ActorMap.GetActorsAt(self.Location)
-				.FirstOrDefault(a => Info.RearmBuildings.Contains(a.Info.Name) || Info.RepairBuildings.Contains(a.Info.Name));
+				.FirstOrDefault(a => rearmableInfo.RearmActors.Contains(a.Info.Name) || repairableInfo.RepairBuildings.Contains(a.Info.Name));
 		}
 
 		protected void ReserveSpawnBuilding()

OpenRA.Mods.Common/Traits/Armament.cs

@@ -257,7 +257,7 @@ public virtual Barrel CheckFire(Actor self, IFacing facing, Target target)
 			currentBarrel++;
 
 			foreach (var na in notifyAttacks)
-				na.PreparingAttack(self, target, this, barrel)
+				na.PreparingAttack(self, target, this, barrel);
 
 			Func<WPos> muzzlePosition = () => self.CenterPosition + MuzzleOffset(self, barrel);
 			var legacyFacing = MuzzleOrientation(self, barrel).Yaw.Angle / 4;