From 2e0a8ef9c470bd73d1a3028aa9f42bb6c9bbcb02 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Fri, 30 Oct 2015 14:26:23 +0100 Subject: [PATCH] Make sandworms not eat infantry --- OpenRA.Mods.D2k/Traits/Sandworm.cs | 3 ++- mods/d2k/weapons.yaml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/OpenRA.Mods.D2k/Traits/Sandworm.cs b/OpenRA.Mods.D2k/Traits/Sandworm.cs index b525e58239..2ee042dc1f 100644 --- a/OpenRA.Mods.D2k/Traits/Sandworm.cs +++ b/OpenRA.Mods.D2k/Traits/Sandworm.cs @@ -99,7 +99,8 @@ namespace OpenRA.Mods.D2k.Traits targetCountdown = Info.TargetRescanInterval; // If close enough, we don't care about other actors. - var target = self.World.FindActorsInCircle(self.CenterPosition, Info.IgnoreNoiseAttackRange).FirstOrDefault(x => x.Info.HasTraitInfo()); + var target = self.World.FindActorsInCircle(self.CenterPosition, Info.IgnoreNoiseAttackRange) + .FirstOrDefault(x => attackTrait.HasAnyValidWeapons(Target.FromActor(x))); if (target != null) { self.CancelActivity(); diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index 3d13dd3b67..f1fc599a27 100644 --- a/mods/d2k/weapons.yaml +++ b/mods/d2k/weapons.yaml @@ -563,10 +563,10 @@ Heal: WormJaw: ReloadDelay: 10 - InvalidTargets: Structure + InvalidTargets: Structure, Infantry Range: 1c512 Warhead@1Dam: SpreadDamage - InvalidTargets: Structure + InvalidTargets: Structure, Infantry Spread: 768 Falloff: 100, 100, 0 Damage: 10000