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

Changed the harvester heuristic so that now takes into account the distance from the initial search location. This makes harvesters somewhat more "intelligent" and gather nearer resources. Also solved several regressions introduced in the recent changes in the Pathfinder

Browse Source
This commit is contained in:
David Jiménez
2015-03-08 11:28:48 +01:00
parent 5fa7e50c8e
commit ea32c20450
4 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenRA.Mods.Common/Activities/FindResources.cs
View File

@@ -8,6 +8,7 @@
*/
#endregion
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
@@ -58,28 +59,28 @@ namespace OpenRA.Mods.Common.Activities
{
// Avoid this cell:
if (avoidCell.HasValue && loc == avoidCell.Value)
return Constants.CellCost;
return EstimateDistance(loc, searchFromLoc) + Constants.CellCost;
// Don't harvest out of range:
var distSquared = (loc - searchFromLoc).LengthSquared;
if (distSquared > searchRadiusSquared)
return Constants.CellCost * 2;
return EstimateDistance(loc, searchFromLoc) + Constants.CellCost * 2;
// Get the resource at this location:
var resType = resLayer.GetResource(loc);
if (resType == null)
return Constants.CellCost;
return EstimateDistance(loc, searchFromLoc) + Constants.CellCost;
// Can the harvester collect this kind of resource?
if (!harvInfo.Resources.Contains(resType.Info.Name))
return Constants.CellCost;
return EstimateDistance(loc, searchFromLoc) + Constants.CellCost;
if (territory != null)
{
// Another harvester has claimed this resource:
ResourceClaim claim;
if (territory.IsClaimedByAnyoneElse(self, loc, out claim))
return Constants.CellCost;
return EstimateDistance(loc, searchFromLoc) + Constants.CellCost;
}
return 0;
@@ -123,6 +124,15 @@ namespace OpenRA.Mods.Common.Activities
return Util.SequenceActivities(mobile.MoveTo(path[0], 1), new HarvestResource(), new FindResources());
}
// Diagonal distance heuristic
static int EstimateDistance(CPos here, CPos destination)
{
var diag = Math.Min(Math.Abs(here.X - destination.X), Math.Abs(here.Y - destination.Y));
var straight = Math.Abs(here.X - destination.X) + Math.Abs(here.Y - destination.Y);
return Constants.CellCost * straight + (Constants.DiagonalCellCost - 2 * Constants.CellCost) * diag;
}
public override IEnumerable<Target> GetTargets(Actor self)
{
yield return Target.FromCell(self.World, self.Location);