Move Targetable*, Seeds/StoresResource(s) and two RenderBuilding traits to Mods.Common

OpenRA.Mods.Common/Traits/Render/RenderBuildingSilo.cs

@@ -0,0 +1,58 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+using OpenRA.Graphics;
+using OpenRA.Mods.Common.Graphics;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Traits
+{
+	class RenderBuildingSiloInfo : RenderBuildingInfo
+	{
+		public override object Create(ActorInitializer init) { return new RenderBuildingSilo(init, this); }
+
+		public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
+		{
+			// Show a static frame instead of animating all of the fullness states
+			var anim = new Animation(init.World, image, () => 0);
+			anim.PlayFetchIndex("idle", () => 0);
+
+			yield return new SpriteActorPreview(anim, WVec.Zero, 0, p, rs.Scale);
+		}
+	}
+
+	class RenderBuildingSilo : RenderBuilding, INotifyBuildComplete, INotifyOwnerChanged
+	{
+		PlayerResources playerResources;
+
+		public RenderBuildingSilo(ActorInitializer init, RenderBuildingSiloInfo info)
+			: base(init, info)
+		{
+			playerResources = init.Self.Owner.PlayerActor.Trait<PlayerResources>();
+		}
+
+		public override void BuildingComplete(Actor self)
+		{
+			var animation = (self.GetDamageState() >= DamageState.Heavy) ? "damaged-idle" : "idle";
+
+			DefaultAnimation.PlayFetchIndex(animation,
+				() => playerResources.ResourceCapacity != 0
+				? ((10 * DefaultAnimation.CurrentSequence.Length - 1) * playerResources.Resources) / (10 * playerResources.ResourceCapacity)
+					: 0);
+		}
+
+		public override void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
+		{
+			playerResources = newOwner.PlayerActor.Trait<PlayerResources>();
+			base.OnOwnerChanged(self, oldOwner, newOwner);
+		}
+	}
+}

OpenRA.Mods.Common/Traits/Render/RenderBuildingWall.cs

@@ -0,0 +1,114 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.Linq;
+using OpenRA.Graphics;
+using OpenRA.Mods.Common.Graphics;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Traits
+{
+	class RenderBuildingWallInfo : RenderBuildingInfo
+	{
+		public readonly string Type = "wall";
+		public readonly string Sequence = "idle";
+
+		public override object Create(ActorInitializer init) { return new RenderBuildingWall(init, this); }
+
+		public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
+		{
+			// Show a static frame instead of animating all of the wall states
+			var anim = new Animation(init.World, image, () => 0);
+			anim.PlayFetchIndex("idle", () => 0);
+
+			yield return new SpriteActorPreview(anim, WVec.Zero, 0, p, rs.Scale);
+		}
+	}
+
+	class RenderBuildingWall : RenderBuilding, INotifyAddedToWorld, INotifyRemovedFromWorld
+	{
+		readonly RenderBuildingWallInfo info;
+		int adjacent = 0;
+		bool dirty = true;
+
+		public RenderBuildingWall(ActorInitializer init, RenderBuildingWallInfo info)
+			: base(init, info)
+		{
+			this.info = info;
+		}
+
+		public override void BuildingComplete(Actor self)
+		{
+			DefaultAnimation.PlayFetchIndex(info.Sequence, () => adjacent);
+			UpdateNeighbours(self);
+		}
+
+		public override void DamageStateChanged(Actor self, AttackInfo e)
+		{
+			DefaultAnimation.PlayFetchIndex(NormalizeSequence(DefaultAnimation, e.DamageState, info.Sequence), () => adjacent);
+		}
+
+		public override void Tick(Actor self)
+		{
+			base.Tick(self);
+
+			if (!dirty)
+				return;
+
+			// Update connection to neighbours
+			var adjacentActors = CVec.Directions.SelectMany(dir =>
+				self.World.ActorMap.GetUnitsAt(self.Location + dir));
+
+			adjacent = 0;
+			foreach (var a in adjacentActors)
+			{
+				var rb = a.TraitOrDefault<RenderBuildingWall>();
+				if (rb == null || rb.info.Type != info.Type)
+					continue;
+
+				var location = self.Location;
+				var otherLocation = a.Location;
+
+				if (otherLocation == location + new CVec(0, -1))
+					adjacent |= 1;
+				else if (otherLocation == location + new CVec(+1, 0))
+					adjacent |= 2;
+				else if (otherLocation == location + new CVec(0, +1))
+					adjacent |= 4;
+				else if (otherLocation == location + new CVec(-1, 0))
+					adjacent |= 8;
+			}
+
+			dirty = false;
+		}
+
+		static void UpdateNeighbours(Actor self)
+		{
+			var adjacentActors = CVec.Directions.SelectMany(dir =>
+					self.World.ActorMap.GetUnitsAt(self.Location + dir))
+				.Select(a => a.TraitOrDefault<RenderBuildingWall>())
+				.Where(a => a != null);
+
+			foreach (var rb in adjacentActors)
+				rb.dirty = true;
+		}
+
+		public void AddedToWorld(Actor self)
+		{
+			UpdateNeighbours(self);
+		}
+
+		public void RemovedFromWorld(Actor self)
+		{
+			UpdateNeighbours(self);
+		}
+	}
+}