Merge pull request #6455 from reaperrr/blocksbullets

Renamed Wall to BlocksBullets

OpenRA.Mods.RA/BlocksBullets.cs

@@ -0,0 +1,20 @@
+#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.Linq;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.RA
+{
+	//TODO: Add functionality like a customizable Height that is compared to projectile altitude
+	[Desc("This actor blocks bullets and missiles without 'High' property.")]
+	public class BlocksBulletsInfo : TraitInfo<BlocksBullets> { }
+	public class BlocksBullets : IBlocksBullets { }
+}

OpenRA.Mods.RA/Buildings/Wall.cs

@@ -1,50 +0,0 @@
-#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.Linq;
-using OpenRA.Traits;
-
-namespace OpenRA.Mods.RA.Buildings
-{
-	public class WallInfo : ITraitInfo, Requires<BuildingInfo>
-	{
-		public readonly string[] CrushClasses = { };
-		public readonly string CrushSound;
-		public object Create(ActorInitializer init) { return new Wall(init.self, this); }
-	}
-
-	public class Wall : ICrushable, IBlocksBullets
-	{
-		readonly Actor self;
-		readonly WallInfo info;
-
-		public Wall(Actor self, WallInfo info)
-		{
-			this.self = self;
-			this.info = info;
-		}
-
-		public void WarnCrush(Actor crusher) {}
-
-		public bool CrushableBy(string[] crushClasses, Player crushOwner)
-		{
-			if (crushOwner.Stances[self.Owner] == Stance.Ally)
-				return false;
-
-			return info.CrushClasses.Intersect(crushClasses).Any();
-		}
-
-		public void OnCrush(Actor crusher)
-		{
-			self.Kill(crusher);
-			Sound.Play(info.CrushSound, self.CenterPosition);
-		}
-	}
-}

OpenRA.Mods.RA/Effects/Bullet.cs

@@ -28,7 +28,7 @@ namespace OpenRA.Mods.RA.Effects
 		[Desc("Maximum offset at the maximum range")]
 		public readonly WRange Inaccuracy = WRange.Zero;
 		public readonly string Image = null;
-		[Desc("Check for whether an actor with Wall: trait blocks fire")]
+		[Desc("Check for whether an actor with BlocksBullets: trait blocks fire")]
 		public readonly bool High = false;
 		public readonly bool Shadow = false;
 		[Desc("Arc in WAngles, two values indicate variable arc.")]

OpenRA.Mods.RA/Effects/Missile.cs

@@ -25,7 +25,7 @@ namespace OpenRA.Mods.RA.Effects
 		public readonly WRange Speed = new WRange(8);
 		public readonly WAngle MaximumPitch = WAngle.FromDegrees(30);
 		public readonly int Arm = 0;
-		[Desc("Check for whether an actor with Wall: trait blocks fire")]
+		[Desc("Check for whether an actor with BlocksBullets: trait blocks fire")]
 		public readonly bool High = false;
 		public readonly bool Shadow = false;
 		public readonly string Trail = null;

OpenRA.Mods.RA/OpenRA.Mods.RA.csproj

@@ -183,7 +183,7 @@
     <Compile Include="Buildings\ShakeOnDeath.cs" />
     <Compile Include="Buildings\SoundOnDamageTransition.cs" />
     <Compile Include="Buildings\Util.cs" />
-    <Compile Include="Buildings\Wall.cs" />
+    <Compile Include="BlocksBullets.cs" />
     <Compile Include="Burns.cs" />
     <Compile Include="C4Demolition.cs" />
     <Compile Include="ExternalCapturable.cs" />

OpenRA.Utility/UpgradeRules.cs

@@ -547,6 +547,22 @@ namespace OpenRA.Utility
 					}
 				}
 
+				// Replaced Wall with Crushable + BlocksBullets
+				if (engineVersion < 20140914)
+				{
+					if (depth == 0)
+					{
+						var actorTraits = node.Value.Nodes;
+						var wall = actorTraits.FirstOrDefault(t => t.Key == "Wall");
+						if (wall != null)
+							node.Value.Nodes.Add(new MiniYamlNode("BlocksBullets", new MiniYaml("")));
+
+						var blocksBullets = actorTraits.FirstOrDefault(t => t.Key == "BlocksBullets");
+						if (depth == 1 && node.Key == "Wall" && blocksBullets != null)
+							node.Key = "Crushable";
+					}
+				}
+
 				UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1);
 			}
 		}

mods/cnc/rules/defaults.yaml

@@ -462,9 +462,10 @@
 		TerrainTypes: Clear,Road
 	TargetableBuilding:
 		TargetTypes: Ground, Wall
-	Wall:
+	Crushable:
 		CrushClasses: wall
 		CrushSound: sandbag2.aud
+	BlocksBullets:
 	LineBuild:
 		Range: 8
 		NodeTypes: wall

mods/cnc/rules/structures.yaml

@@ -863,7 +863,7 @@ BRIK:
 		HP: 250
 	Armor:
 		Type: Heavy
-	Wall:
+	Crushable:
 		CrushClasses: heavywall
 		-CrushSound:
 	SoundOnDamageTransition:

mods/d2k/rules/structures.yaml

@@ -417,8 +417,9 @@ CONCRETEB:
 		HP: 300
 	Armor:
 		Type: Concrete
-	Wall:
+	Crushable:
 		CrushClasses: Concretewall
+	BlocksBullets:
 	LineBuild:
 		Range: 8
 		NodeTypes: wall, turret

mods/ra/maps/room-convergence/map.yaml

@@ -751,7 +751,7 @@ Rules:
 		SoundOnDamageTransition:
 			DamagedSound:
 			DestroyedSound:
-		Wall:
+		Crushable:
 			CrushClasses: heavywall
 
 Sequences:

mods/ra/rules/defaults.yaml

@@ -332,8 +332,9 @@
 	SoundOnDamageTransition:
 		DamagedSound: sandbag2.aud
 		DestroyedSound: sandbag2.aud
-	Wall:
+	Crushable:
 		CrushClasses: wall
+	BlocksBullets:
 	LineBuild:
 		Range: 8
 		NodeTypes: wall

mods/ra/rules/structures.yaml

@@ -1399,7 +1399,7 @@ BRIK:
 		HP: 500
 	Armor:
 		Type: Concrete
-	Wall:
+	Crushable:
 		CrushClasses: heavywall
 	LineBuild:
 		Range: 8

mods/ts/rules/defaults.yaml

@@ -54,8 +54,9 @@
 	SoundOnDamageTransition:
 		DamagedSound: expnew01.aud
 		DestroyedSound: crmble2.aud
-	Wall:
+	Crushable:
 		CrushClasses: wall
+	BlocksBullets:
 	LineBuild:
 		Range: 8
 		NodeTypes: wall

mods/ts/rules/structures.yaml

@@ -395,6 +395,8 @@ GAWALL:
 		HP: 300
 	Armor:
 		Type: Concrete
+	Crushable:
+		CrushClasses: heavywall
 	LineBuild:
 		NodeTypes: wall, turret
 
@@ -419,6 +421,8 @@ NAWALL:
 		HP: 300
 	Armor:
 		Type: Concrete
+	Crushable:
+		CrushClasses: heavywall
 	LineBuild:
 		NodeTypes: wall, turret