Remove duplication

OpenRA.Game/Effects/CrateEffect.cs

@@ -0,0 +1,51 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Collections.Generic;
+using OpenRA.Graphics;
+using OpenRA.Traits;
+
+namespace OpenRA.Effects
+{
+	class CrateEffect : IEffect
+	{
+		Actor a;
+		Animation anim = new Animation("crate-effects");
+		float2 doorOffset = new float2(-4,0);
+
+		public CrateEffect(Actor a, string seq)
+		{
+			this.a = a;
+			anim.PlayThen(seq,
+				() => a.World.AddFrameEndTask(w => w.Remove(this)));
+		}
+
+		public void Tick( World world )
+		{
+			anim.Tick();
+		}
+		
+		public IEnumerable<Renderable> Render()
+		{
+			yield return new Renderable(anim.Image,
+				a.CenterLocation - .5f * anim.Image.size + doorOffset, "effect");
+		}
+	}
+}

OpenRA.Game/OpenRA.Game.csproj

@@ -286,6 +286,8 @@
     <Compile Include="Chrome\CheckboxWidget.cs" />
     <Compile Include="Traits\HasUnitOnBuild.cs" />
     <Compile Include="Traits\Activities\Wait.cs" />
+    <Compile Include="Traits\CrateAction.cs" />
+    <Compile Include="Effects\CrateEffect.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">

OpenRA.Game/Traits/Crate.cs

@@ -62,7 +62,7 @@ namespace OpenRA.Traits
 
 		public void OnCrush(Actor crusher)
 		{
-			var shares = self.traits.WithInterface<ICrateAction>().Select(a => Pair.New(a, a.GetSelectionShares(crusher)));
+			var shares = self.traits.WithInterface<CrateAction>().Select(a => Pair.New(a, a.GetSelectionShares(crusher)));
 			var totalShares = shares.Sum(a => a.Second);
 			var n = self.World.SharedRandom.Next(totalShares);
 

OpenRA.Game/Traits/CrateAction.cs

@@ -0,0 +1,60 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using OpenRA.Effects;
+
+namespace OpenRA.Traits
+{
+	public class CrateActionInfo : ITraitInfo
+	{
+		public int SelectionShares = 10;
+		public string Effect = null;
+		public string Notification = null;
+		public virtual object Create(Actor self) { return new CrateAction(self, this); }
+	}
+
+	public class CrateAction
+	{
+		public Actor self;
+		public CrateActionInfo info;
+		
+		public CrateAction(Actor self, CrateActionInfo info)
+		{
+			this.self = self;
+			this.info = info;
+		}
+		
+		public virtual int GetSelectionShares(Actor collector)
+		{
+			return info.SelectionShares;
+		}
+		
+		public virtual void Activate(Actor collector)
+		{
+			Sound.PlayToPlayer(collector.Owner, info.Notification);
+			
+			collector.World.AddFrameEndTask(w => 
+			{
+				if (info.Effect != null)
+					w.Add(new CrateEffect(collector, info.Effect));
+			});
+		}
+	}
+}

OpenRA.Game/Traits/TraitsInterfaces.cs

@@ -82,13 +82,7 @@ namespace OpenRA.Traits
 		bool IsCrushableBy(UnitMovementType umt, Player player);
 		bool IsPathableCrush(UnitMovementType umt, Player player);
 	}
-	
-	public interface ICrateAction
-	{
-		int GetSelectionShares(Actor collector);
-		void Activate(Actor collector);
-	}
-	
+		
 	public struct Renderable
 	{
 		public readonly Sprite Sprite;