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

Merge pull request #8662 from atlimit8/UpgradableTargetableUnit

Browse Source 
Upgradable TargetableUnit & apply to Allies 03
This commit is contained in:
abcdefg30
2015-07-13 15:40:28 +02:00
parent 4297d06ba3 acc4b307b6
commit ea5ef1c500
5 changed files with 21 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Traits/Air/TargetableAircraft.cs
View File

@@ -35,8 +35,8 @@ namespace OpenRA.Mods.Common.Traits
{
get
{
return (self.CenterPosition.Z > 0) ? info.TargetTypes
: info.GroundedTargetTypes;
return IsTraitDisabled ? None
: (self.CenterPosition.Z > 0 ? info.TargetTypes : info.GroundedTargetTypes);
}
}
}

16
OpenRA.Mods.Common/Traits/TargetableUnit.cs
View File

@@ -14,7 +14,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("Actor can be targeted.")]
public class TargetableUnitInfo : ITraitInfo, ITargetableInfo
public class TargetableUnitInfo : UpgradableTraitInfo, ITargetableInfo
{
[Desc("Target type. Used for filtering (in)valid targets.")]
public readonly string[] TargetTypes = { };
@@ -22,35 +22,37 @@ namespace OpenRA.Mods.Common.Traits
public bool RequiresForceFire = false;
public virtual object Create(ActorInitializer init) { return new TargetableUnit(init.Self, this); }
public override object Create(ActorInitializer init) { return new TargetableUnit(init.Self, this); }
}
public class TargetableUnit : ITargetable
public class TargetableUnit : UpgradableTrait<TargetableUnitInfo>, ITargetable
{
readonly TargetableUnitInfo info;
protected static readonly string[] None = new string[] { };
protected Cloak cloak;
public TargetableUnit(Actor self, TargetableUnitInfo info)
: base(info)
{
this.info = info;
cloak = self.TraitOrDefault<Cloak>();
}
public virtual bool TargetableBy(Actor self, Actor viewer)
{
if (IsTraitDisabled)
return false;
if (cloak == null || (!viewer.IsDead && viewer.HasTrait<IgnoresCloak>()))
return true;
return cloak.IsVisible(self, viewer.Owner);
}
public virtual string[] TargetTypes { get { return info.TargetTypes; } }
public virtual string[] TargetTypes { get { return IsTraitDisabled ? None : Info.TargetTypes; } }
public virtual IEnumerable<WPos> TargetablePositions(Actor self)
{
yield return self.CenterPosition;
}
public bool RequiresForceFire { get { return info.RequiresForceFire; } }
public bool RequiresForceFire { get { return Info.RequiresForceFire; } }
}
}