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

Add ActorInfo.HasTraitInfo<T>() requiring ITraitInfo types

Browse Source
This commit is contained in:
atlimit8
2015-08-02 12:44:46 -05:00
parent 85fab45451
commit 8162fa27ab
77 changed files with 138 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.D2k/Activities/SwallowActor.cs
View File

@@ -79,7 +79,7 @@ namespace OpenRA.Mods.D2k.Activities
actor1.Dispose();
// Harvester insurance
if (!actor1.Info.Traits.Contains<HarvesterInfo>())
if (!actor1.Info.HasTraitInfo<HarvesterInfo>())
return;
var insurance = actor1.Owner.PlayerActor.TraitOrDefault<HarvesterInsurance>();

2
OpenRA.Mods.D2k/Traits/Carryable.cs
View File

@@ -117,7 +117,7 @@ namespace OpenRA.Mods.D2k.Traits
{
// HACK: Harvesters need special treatment to avoid getting stuck on resource fields,
// so if a Harvester's afterLandActivity is not DeliverResources, queue a new FindResources activity
var findResources = self.Info.Traits.Contains<HarvesterInfo>() && !(afterLandActivity is DeliverResources);
var findResources = self.Info.HasTraitInfo<HarvesterInfo>() && !(afterLandActivity is DeliverResources);
if (findResources)
self.QueueActivity(new FindResources(self));
else

2
OpenRA.Mods.D2k/Traits/Render/WithDeliveryOverlay.cs
View File

@@ -49,7 +49,7 @@ namespace OpenRA.Mods.D2k.Traits
var body = self.Trait<BodyOrientation>();
// always render instantly for units
buildComplete = !self.Info.Traits.Contains<BuildingInfo>();
buildComplete = !self.Info.HasTraitInfo<BuildingInfo>();
var overlay = new Animation(self.World, rs.GetImage(self));
overlay.Play(info.Sequence);

4
OpenRA.Mods.D2k/Traits/Sandworm.cs
View File

@@ -99,7 +99,7 @@ namespace OpenRA.Mods.D2k.Traits
targetCountdown = Info.TargetRescanInterval;
// If close enough, we don't care about other actors.
var target = self.World.FindActorsInCircle(self.CenterPosition, Info.IgnoreNoiseAttackRange).FirstOrDefault(x => x.Info.Traits.Contains<AttractsWormsInfo>());
var target = self.World.FindActorsInCircle(self.CenterPosition, Info.IgnoreNoiseAttackRange).FirstOrDefault(x => x.Info.HasTraitInfo<AttractsWormsInfo>());
if (target != null)
{
self.CancelActivity();
@@ -109,7 +109,7 @@ namespace OpenRA.Mods.D2k.Traits
Func<Actor, bool> isValidTarget = a =>
{
if (!a.Info.Traits.Contains<AttractsWormsInfo>())
if (!a.Info.HasTraitInfo<AttractsWormsInfo>())
return false;
return mobile.CanEnterCell(a.Location, null, false);