epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix actors ignoring Disguise

Browse Source
This commit is contained in:
Pavel Penev
2015-10-18 18:29:55 +03:00
parent 8c7bdae617
commit 000c701414
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
View File

@@ -223,13 +223,24 @@ namespace OpenRA.Mods.Common.Traits
// (short-circuiting in the logical expression below) // (short-circuiting in the logical expression below)
var owner = null as Player; var owner = null as Player;
if (t.Type == TargetType.FrozenActor) if (t.Type == TargetType.FrozenActor)
{
owner = t.FrozenActor.Owner; owner = t.FrozenActor.Owner;
}
else if (t.Type == TargetType.Actor) else if (t.Type == TargetType.Actor)
owner = t.Actor.Owner; {
owner = t.Actor.EffectiveOwner != null && t.Actor.EffectiveOwner.Owner != null
? t.Actor.EffectiveOwner.Owner
: t.Actor.Owner;
return Armaments.Where(a => (!a.IsTraitDisabled || !onlyEnabled) && // Special cases for spies so we don't kill friendly disguised spies
a.Weapon.IsValidAgainst(t, self.World, self) && // and enable dogs to kill enemy disguised spies.
(owner == null || (forceAttack ? a.Info.ForceTargetStances : a.Info.TargetStances) if (self.Owner.Stances[t.Actor.Owner] == Stance.Ally || self.Info.HasTraitInfo<IgnoresDisguiseInfo>())
owner = t.Actor.Owner;
}
return Armaments.Where(a => (!a.IsTraitDisabled || !onlyEnabled)
&& a.Weapon.IsValidAgainst(t, self.World, self)
&& (owner == null || (forceAttack ? a.Info.ForceTargetStances : a.Info.TargetStances)
.HasStance(self.Owner.Stances[owner]))); .HasStance(self.Owner.Stances[owner])));
} }