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

Replace turret IsDisabled check with AT.IsTraitDisabled check

Browse Source
This commit is contained in:
reaperrr
2017-10-17 16:37:35 +02:00
committed by Pavel Penev
parent cea2658f31
commit 68487d1197
2 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Traits/Attack/AttackTurreted.cs
View File

@@ -17,6 +17,9 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Actor has a visual turret used to attack.")]
public class AttackTurretedInfo : AttackFollowInfo, Requires<TurretedInfo>
{
[Desc("Turret names")]
public readonly string[] Turrets = { "primary" };
public override object Create(ActorInitializer init) { return new AttackTurreted(init.Self, this); }
}
@@ -27,7 +30,7 @@ namespace OpenRA.Mods.Common.Traits
public AttackTurreted(Actor self, AttackTurretedInfo info)
: base(self, info)
{
turrets = self.TraitsImplementing<Turreted>().ToArray();
turrets = self.TraitsImplementing<Turreted>().Where(t => info.Turrets.Contains(t.Info.Turret)).ToArray();
}
protected override bool CanAttack(Actor self, Target target)