Merge pull request #8816 from reaperrr/common-armor

Moved Armor trait to Mods.Common

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

@@ -260,6 +260,7 @@
     <Compile Include="Traits\Air\TargetableAircraft.cs" />
     <Compile Include="Traits\AppearsOnRadar.cs" />
     <Compile Include="Traits\Armament.cs" />
+    <Compile Include="Traits\Armor.cs" />
     <Compile Include="Traits\AttackMove.cs" />
     <Compile Include="Traits\Attack\AttackBase.cs" />
     <Compile Include="Traits\Attack\AttackCharge.cs" />

OpenRA.Mods.Common/Traits/Armor.cs

@@ -0,0 +1,22 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 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 OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Traits
+{
+	[Desc("Used to define weapon efficiency modifiers with different percentages per Type.")]
+	public class ArmorInfo : TraitInfo<Armor>
+	{
+		public readonly string Type = null;
+	}
+
+	public class Armor { }
+}

OpenRA.Mods.Common/Warheads/DamageWarhead.cs

@@ -9,6 +9,7 @@
 #endregion
 
 using System.Collections.Generic;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common.Warheads