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

Remove unnecessary Lazy<>s from Sandworm.cs

Browse Source
This commit is contained in:
atlimit8
2015-07-25 23:10:42 -05:00
parent 808bbb8d2e
commit cc3b286fa6
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,9 +46,9 @@ namespace OpenRA.Mods.D2k.Traits
public readonly SandwormInfo Info; public readonly SandwormInfo Info;
readonly WormManager manager; readonly WormManager manager;
readonly Lazy<Mobile> mobile; readonly Mobile mobile;
readonly Lazy<WithSpriteBody> withSpriteBody; readonly WithSpriteBody withSpriteBody;
readonly Lazy<AttackBase> attackTrait; readonly AttackBase attackTrait;
public bool IsMovingTowardTarget { get; private set; } public bool IsMovingTowardTarget { get; private set; }
@@ -60,16 +60,16 @@ namespace OpenRA.Mods.D2k.Traits
: base(self, info) : base(self, info)
{ {
Info = info; Info = info;
mobile = Exts.Lazy(self.Trait<Mobile>); mobile = self.Trait<Mobile>();
withSpriteBody = Exts.Lazy(self.Trait<WithSpriteBody>); withSpriteBody = self.Trait<WithSpriteBody>();
attackTrait = Exts.Lazy(self.Trait<AttackBase>); attackTrait = self.Trait<AttackBase>();
manager = self.World.WorldActor.Trait<WormManager>(); manager = self.World.WorldActor.Trait<WormManager>();
} }
public override void OnBecomingIdle(Actor self) public override void OnBecomingIdle(Actor self)
{ {
if (withSpriteBody.Value.DefaultAnimation.CurrentSequence.Name != Info.IdleSequence) if (withSpriteBody.DefaultAnimation.CurrentSequence.Name != Info.IdleSequence)
withSpriteBody.Value.DefaultAnimation.PlayRepeating(Info.IdleSequence); withSpriteBody.DefaultAnimation.PlayRepeating(Info.IdleSequence);
base.OnBecomingIdle(self); base.OnBecomingIdle(self);
} }
@@ -83,7 +83,7 @@ namespace OpenRA.Mods.D2k.Traits
if (IsMovingTowardTarget) if (IsMovingTowardTarget)
return; return;
self.QueueActivity(mobile.Value.MoveWithinRange(Target.FromCell(self.World, targetCell, SubCell.Any), WDist.FromCells(1))); self.QueueActivity(mobile.MoveWithinRange(Target.FromCell(self.World, targetCell, SubCell.Any), WDist.FromCells(1)));
} }
public void Tick(Actor self) public void Tick(Actor self)
@@ -103,7 +103,7 @@ namespace OpenRA.Mods.D2k.Traits
if (target != null) if (target != null)
{ {
self.CancelActivity(); self.CancelActivity();
attackTrait.Value.ResolveOrder(self, new Order("Attack", target, true) { TargetActor = target }); attackTrait.ResolveOrder(self, new Order("Attack", target, true) { TargetActor = target });
return; return;
} }
@@ -112,7 +112,7 @@ namespace OpenRA.Mods.D2k.Traits
if (!a.HasTrait<AttractsWorms>()) if (!a.HasTrait<AttractsWorms>())
return false; return false;
return mobile.Value.CanEnterCell(a.Location, null, false); return mobile.CanEnterCell(a.Location, null, false);
}; };
var actorsInRange = self.World.FindActorsInCircle(self.CenterPosition, Info.MaxSearchRadius) var actorsInRange = self.World.FindActorsInCircle(self.CenterPosition, Info.MaxSearchRadius)
@@ -126,7 +126,7 @@ namespace OpenRA.Mods.D2k.Traits
var moveTo = self.World.Map.CellContaining(self.CenterPosition + noiseDirection); var moveTo = self.World.Map.CellContaining(self.CenterPosition + noiseDirection);
while (!self.World.Map.Contains(moveTo) || !mobile.Value.CanEnterCell(moveTo, null, false)) while (!self.World.Map.Contains(moveTo) || !mobile.CanEnterCell(moveTo, null, false))
{ {
noiseDirection /= 2; noiseDirection /= 2;
moveTo = self.World.Map.CellContaining(self.CenterPosition + noiseDirection); moveTo = self.World.Map.CellContaining(self.CenterPosition + noiseDirection);
@@ -139,7 +139,7 @@ namespace OpenRA.Mods.D2k.Traits
return; return;
} }
self.QueueActivity(false, mobile.Value.MoveTo(moveTo, 3)); self.QueueActivity(false, mobile.MoveTo(moveTo, 3));
IsMovingTowardTarget = true; IsMovingTowardTarget = true;
} }