Refactor Bib & footprint cells - part 1

OpenRA.Game/Traits/TraitsInterfaces.cs

@@ -201,6 +201,11 @@ public interface IFogVisibilityModifier
 
 	public interface IRadarColorModifier { Color RadarColorOverride(Actor self, Color color); }
 
+	public interface ITargetableCells
+	{
+		IEnumerable<Pair<CPos, SubCell>> TargetableCells();
+	}
+
 	public interface IOccupySpaceInfo : ITraitInfoInterface
 	{
 		IReadOnlyDictionary<CPos, SubCell> OccupiedCells(ActorInfo info, CPos location, SubCell subCell = SubCell.Any);

OpenRA.Mods.Common/Traits/Buildings/Building.cs

@@ -27,21 +27,30 @@ public class BuildingInfo : ITraitInfo, IOccupySpaceInfo, IPlaceBuildingDecorati
 	{
 		[Desc("Where you are allowed to place the building (Water, Clear, ...)")]
 		public readonly HashSet<string> TerrainTypes = new HashSet<string>();
+
 		[Desc("The range to the next building it can be constructed. Set it higher for walls.")]
 		public readonly int Adjacent = 2;
+
 		[Desc("x means space it blocks, _ is a part that is passable by actors.")]
 		public readonly string Footprint = "x";
+
 		public readonly CVec Dimensions = new CVec(1, 1);
+
 		public readonly bool RequiresBaseProvider = false;
+
 		public readonly bool AllowInvalidPlacement = false;
+
 		[Desc("Clear smudges from underneath the building footprint.")]
 		public readonly bool RemoveSmudgesOnBuild = true;
+
 		[Desc("Clear smudges from underneath the building footprint on sell.")]
 		public readonly bool RemoveSmudgesOnSell = true;
+
 		[Desc("Clear smudges from underneath the building footprint on transform.")]
 		public readonly bool RemoveSmudgesOnTransform = true;
 
 		public readonly string[] BuildSounds = { "placbldg.aud", "build5.aud" };
+
 		public readonly string[] UndeploySounds = { "cashturn.aud" };
 
 		public virtual object Create(ActorInitializer init) { return new Building(init, this); }
@@ -135,7 +144,7 @@ public IEnumerable<IRenderable> Render(WorldRenderer wr, World w, ActorInfo ai,
 		}
 	}
 
-	public class Building : IOccupySpace, INotifySold, INotifyTransform, ISync, INotifyCreated, INotifyAddedToWorld, INotifyRemovedFromWorld
+	public class Building : IOccupySpace, ITargetableCells, INotifySold, INotifyTransform, ISync, INotifyCreated, INotifyAddedToWorld, INotifyRemovedFromWorld
 	{
 		public readonly BuildingInfo Info;
 		public bool BuildComplete { get; private set; }
@@ -144,6 +153,7 @@ public class Building : IOccupySpace, INotifySold, INotifyTransform, ISync, INot
 		public readonly bool SkipMakeAnimation;
 
 		Pair<CPos, SubCell>[] occupiedCells;
+		Pair<CPos, SubCell>[] targetableCells;
 
 		// Shared activity lock: undeploy, sell, capture, etc.
 		[Sync] public bool Locked = true;
@@ -171,12 +181,17 @@ public Building(ActorInitializer init, BuildingInfo info)
 			occupiedCells = FootprintUtils.UnpathableTiles(self.Info.Name, Info, TopLeft)
 				.Select(c => Pair.New(c, SubCell.FullCell)).ToArray();
 
+			targetableCells = FootprintUtils.UnpathableTiles(self.Info.Name, Info, TopLeft)
+				.Select(c => Pair.New(c, SubCell.FullCell)).ToArray();
+
 			CenterPosition = init.World.Map.CenterOfCell(topLeft) + FootprintUtils.CenterOffset(init.World, Info);
 			SkipMakeAnimation = init.Contains<SkipMakeAnimsInit>();
 		}
 
 		public IEnumerable<Pair<CPos, SubCell>> OccupiedCells() { return occupiedCells; }
 
+		public IEnumerable<Pair<CPos, SubCell>> TargetableCells() { return targetableCells; }
+
 		void INotifyCreated.Created(Actor self)
 		{
 			if (SkipMakeAnimation || !self.Info.HasTraitInfo<WithMakeAnimationInfo>())

OpenRA.Mods.Common/Traits/HitShape.cs

@@ -60,15 +60,15 @@ static object LoadShape(MiniYaml yaml)
 	public class HitShape : ConditionalTrait<HitShapeInfo>, ITargetablePositions
 	{
 		BodyOrientation orientation;
-		IOccupySpace occupy;
+		ITargetableCells targetableCells;
 
 		public HitShape(Actor self, HitShapeInfo info)
 			: base(info) { }
 
 		protected override void Created(Actor self)
 		{
 			orientation = self.Trait<BodyOrientation>();
-			occupy = self.TraitOrDefault<IOccupySpace>();
+			targetableCells = self.TraitOrDefault<ITargetableCells>();
 
 			base.Created(self);
 		}
@@ -78,8 +78,8 @@ public IEnumerable<WPos> TargetablePositions(Actor self)
 			if (IsTraitDisabled)
 				yield break;
 
-			if (Info.UseOccupiedCellsOffsets && occupy != null)
-				foreach (var c in occupy.OccupiedCells())
+			if (Info.UseOccupiedCellsOffsets && targetableCells != null)
+				foreach (var c in targetableCells.TargetableCells())
 					yield return self.World.Map.CenterOfCell(c.First);
 
 			foreach (var o in Info.TargetableOffsets)