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

Remove Actor.HasTrait<T>()

Browse Source
This commit is contained in:
atlimit8
2015-08-01 23:53:58 -05:00
parent 959914779f
commit 85fab45451
79 changed files with 153 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/Activities/Infiltrate.cs
View File

@@ -50,7 +50,7 @@ namespace OpenRA.Mods.RA.Activities
self.Dispose();
if (target.HasTrait<Building>())
if (target.Info.Traits.Contains<BuildingInfo>())
Sound.PlayToPlayer(self.Owner, "bldginf1.aud");
}
}

2
OpenRA.Mods.RA/Traits/Buildings/ClonesProducedUnits.cs
View File

@@ -41,7 +41,7 @@ namespace OpenRA.Mods.RA.Traits
public void UnitProducedByOther(Actor self, Actor producer, Actor produced)
{
// No recursive cloning!
if (producer.Owner != self.Owner || producer.HasTrait<ClonesProducedUnits>())
if (producer.Owner != self.Owner || producer.Info.Traits.Contains<ClonesProducedUnitsInfo>())
return;
var ci = produced.Info.Traits.GetOrDefault<CloneableInfo>();

2
OpenRA.Mods.RA/Traits/Chronoshiftable.cs
View File

@@ -64,7 +64,7 @@ namespace OpenRA.Mods.RA.Traits
public virtual bool CanChronoshiftTo(Actor self, CPos targetLocation)
{
// TODO: Allow enemy units to be chronoshifted into bad terrain to kill them
return self.HasTrait<IPositionable>() && self.Trait<IPositionable>().CanEnterCell(targetLocation);
return self.Info.Traits.Contains<IPositionableInfo>() && self.Trait<IPositionable>().CanEnterCell(targetLocation);
}
public virtual bool Teleport(Actor self, CPos targetLocation, int duration, bool killCargo, Actor chronosphere)

4
OpenRA.Mods.RA/Traits/Disguise.cs
View File

@@ -24,7 +24,7 @@ namespace OpenRA.Mods.RA.Traits
public override object Create(ActorInitializer init) { return new DisguiseToolTip(init.Self, this); }
}
class DisguiseToolTip : IToolTip
class DisguiseToolTip : ITooltip
{
readonly Actor self;
readonly Disguise disguise;
@@ -147,7 +147,7 @@ namespace OpenRA.Mods.RA.Traits
else
{
AsSprite = target.Trait<RenderSprites>().GetImage(target);
var tooltip = target.TraitsImplementing<IToolTip>().FirstOrDefault();
var tooltip = target.TraitsImplementing<ITooltip>().FirstOrDefault();
AsPlayer = tooltip.Owner;
AsTooltipInfo = tooltip.TooltipInfo;
}

2
OpenRA.Mods.RA/Traits/Mine.cs
View File

@@ -39,7 +39,7 @@ namespace OpenRA.Mods.RA.Traits
public void OnCrush(Actor crusher)
{
if (crusher.HasTrait<MineImmune>() || (self.Owner.Stances[crusher.Owner] == Stance.Ally && info.AvoidFriendly))
if (crusher.Info.Traits.Contains<MineImmuneInfo>() || (self.Owner.Stances[crusher.Owner] == Stance.Ally && info.AvoidFriendly))
return;
var mobile = crusher.TraitOrDefault<Mobile>();

2
OpenRA.Mods.RA/Traits/SupportPowers/ChronoshiftPower.cs
View File

@@ -64,7 +64,7 @@ namespace OpenRA.Mods.RA.Traits
foreach (var t in tiles)
units.UnionWith(Self.World.ActorMap.GetUnitsAt(t));
return units.Where(a => a.HasTrait<Chronoshiftable>() &&
return units.Where(a => a.Info.Traits.Contains<ChronoshiftableInfo>() &&
!a.TraitsImplementing<IPreventsTeleport>().Any(condition => condition.PreventsTeleport(a)));
}