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

Add multiple levels of fallback.

Browse Source
This commit is contained in:
Paul Chote
2019-12-31 15:15:48 +00:00
parent a43335c7b0
commit 3a688e03f0
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenRA.Mods.Common/Activities/Move/Move.cs
View File

@@ -30,6 +30,14 @@ namespace OpenRA.Mods.Common.Activities
readonly Actor ignoreActor; readonly Actor ignoreActor;
readonly Color? targetLineColor; readonly Color? targetLineColor;
static readonly BlockedByActor[] PathSearchOrder =
{
BlockedByActor.All,
BlockedByActor.Immovable,
BlockedByActor.Stationary,
BlockedByActor.None
};
List<CPos> path; List<CPos> path;
CPos? destination; CPos? destination;
@@ -150,9 +158,12 @@ namespace OpenRA.Mods.Common.Activities
} }
// TODO: Change this to BlockedByActor.Stationary after improving the local avoidance behaviour // TODO: Change this to BlockedByActor.Stationary after improving the local avoidance behaviour
path = EvalPath(BlockedByActor.All); foreach (var check in PathSearchOrder)
if (path.Count == 0) {
path = EvalPath(BlockedByActor.None); path = EvalPath(check);
if (path.Count > 0)
return;
}
} }
public override bool Tick(Actor self) public override bool Tick(Actor self)