Merge pull request #9357 from UberWaffe/LineImpactProjectile

Added a LineImpactProjectile (Attempt 2)

OpenRA.Mods.Common/Traits/Armament.cs

@@ -187,7 +187,7 @@ namespace OpenRA.Mods.Common.Traits
 				return null;
 
 			var barrel = Barrels[Burst % Barrels.Length];
-			var muzzlePosition = self.CenterPosition + MuzzleOffset(self, barrel);
+			Func<WPos> muzzlePosition = () => self.CenterPosition + MuzzleOffset(self, barrel);
 			var legacyFacing = MuzzleOrientation(self, barrel).Yaw.Angle / 4;
 
 			var args = new ProjectileArgs
@@ -204,7 +204,8 @@ namespace OpenRA.Mods.Common.Traits
 				RangeModifiers = self.TraitsImplementing<IRangeModifier>()
 					.Select(a => a.GetRangeModifier()).ToArray(),
 
-				Source = muzzlePosition,
+				Source = muzzlePosition(),
+				CurrentSource = muzzlePosition,
 				SourceActor = self,
 				PassiveTarget = target.CenterPosition,
 				GuidedTarget = target

OpenRA.Mods.Common/Traits/BlocksProjectiles.cs

@@ -34,5 +34,31 @@ namespace OpenRA.Mods.Common.Traits
 					.Where(t => t.Info.Height.Length >= dat.Length)
 					.Any(Exts.IsTraitEnabled));
 		}
+
+		public static bool AnyBlockingActorsBetween(World world, WPos start, WPos end, WDist width, WDist overscan, out WPos hit)
+		{
+			var actors = world.FindActorsOnLine(start, end, width, overscan);
+			var length = (end - start).Length;
+
+			foreach (var a in actors)
+			{
+				var blockers = a.TraitsImplementing<BlocksProjectiles>()
+					.Where(Exts.IsTraitEnabled).ToList();
+
+				if (!blockers.Any())
+					continue;
+
+				var hitPos = WorldExtensions.MinimumPointLineProjection(start, end, a.CenterPosition);
+				var dat = world.Map.DistanceAboveTerrain(hitPos);
+				if ((hitPos - start).Length < length && blockers.Any(t => t.Info.Height.Length >= dat.Length))
+				{
+					hit = hitPos;
+					return true;
+				}
+			}
+
+			hit = WPos.Zero;
+			return false;
+		}
 	}
 }

OpenRA.Mods.Common/Traits/ThrowsShrapnel.cs

@@ -70,6 +70,7 @@ namespace OpenRA.Mods.Common.Traits
 							.Select(a => a.GetRangeModifier()).ToArray(),
 
 						Source = self.CenterPosition,
+						CurrentSource = () => self.CenterPosition,
 						SourceActor = self,
 						PassiveTarget = self.CenterPosition + new WVec(range, 0, 0).Rotate(rotation)
 					};