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

Restore 6e13cb7f3 (lost while rebasing).

Browse Source
This commit is contained in:
Paul Chote
2013-08-24 12:47:58 +12:00
parent c3da842b06
commit ff36aa301f
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.RA/AI/Squad.cs
View File

@@ -28,7 +28,7 @@ namespace OpenRA.Mods.RA.AI
internal HackyAI bot; internal HackyAI bot;
internal XRandom random; internal XRandom random;
internal Actor target; internal Target target;
internal StateMachine fsm; internal StateMachine fsm;
//fuzzy //fuzzy
@@ -42,7 +42,7 @@ namespace OpenRA.Mods.RA.AI
this.world = bot.world; this.world = bot.world;
this.random = bot.random; this.random = bot.random;
this.type = type; this.type = type;
this.target = target; this.target = Traits.Target.FromActor(target);
fsm = new StateMachine(); fsm = new StateMachine();
switch (type) switch (type)
@@ -70,14 +70,13 @@ namespace OpenRA.Mods.RA.AI
public Actor Target public Actor Target
{ {
get { return target; } get { return target.Actor; }
set { target = value; } set { target = Traits.Target.FromActor(value); }
} }
public bool TargetIsValid public bool TargetIsValid
{ {
get { return (target != null && !target.IsDead() && !target.Destroyed get { return target.IsValidFor(units.FirstOrDefault()) && !target.Actor.HasTrait<Husk>(); }
&& target.IsInWorld && !target.HasTrait<Husk>()); }
} }
public WPos CenterPosition { get { return units.Select(u => u.CenterPosition).Average(); } } public WPos CenterPosition { get { return units.Select(u => u.CenterPosition).Average(); } }