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

Merge pull request #12863 from abcdefg30/ignoreTargetUpgrades

Browse Source 
Make AutoTargetIgnore upgradeable
This commit is contained in:
Paul Chote
2017-03-03 21:27:38 +00:00
committed by GitHub
parent 5e4fa5b311 c833f3857f
commit 77534c2d10
4 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Mods.Common/Traits/AutoTarget.cs
View File

@@ -259,12 +259,19 @@ namespace OpenRA.Mods.Common.Traits
}
[Desc("Will not get automatically targeted by enemy (like walls)")]
class AutoTargetIgnoreInfo : TraitInfo<AutoTargetIgnore> { }
class AutoTargetIgnore : IPreventsAutoTarget
class AutoTargetIgnoreInfo : ConditionalTraitInfo
{
public override object Create(ActorInitializer init) { return new AutoTargetIgnore(this); }
}
class AutoTargetIgnore : ConditionalTrait<AutoTargetIgnoreInfo>, IPreventsAutoTarget
{
public AutoTargetIgnore(AutoTargetIgnoreInfo info)
: base(info) { }
public bool PreventsAutoTarget(Actor self, Actor attacker)
{
return true;
return !IsTraitDisabled;
}
}