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

Improved the performance and intelligence of resource harvesting by

Browse Source 
refactoring the Harvesters' pathfinding. Now they in first place assess
which is the closest resource inside their search area and then a path is
calculated

Changed the way harvesters find resources by always trying to find the
closest resource to their refinery.

Changed the strategy of finding to find resources in Annulus.
This commit is contained in:
David Jiménez
2015-03-13 14:58:22 +01:00
committed by reaperrr
parent a0dc38c252
commit 787609d51e
6 changed files with 154 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
OpenRA.Mods.Common/Pathfinder/PathGraph.cs
View File

@@ -23,7 +23,7 @@ namespace OpenRA.Mods.Common.Pathfinder
/// <summary>
/// Gets all the Connections for a given node in the graph
/// </summary>
ICollection<GraphConnection> GetConnections(CPos position);
IEnumerable<GraphConnection> GetConnections(CPos position);
/// <summary>
/// Retrieves an object given a node in the graph
@@ -102,7 +102,7 @@ namespace OpenRA.Mods.Common.Pathfinder
new[] { new CVec(1, -1), new CVec(1, 0), new CVec(-1, 1), new CVec(0, 1), new CVec(1, 1) },
};
public ICollection<GraphConnection> GetConnections(CPos position)
public IEnumerable<GraphConnection> GetConnections(CPos position)
{
var previousPos = cellInfo[position].PreviousPos;
@@ -116,7 +116,7 @@ namespace OpenRA.Mods.Common.Pathfinder
{
var neighbor = position + directions[i];
var movementCost = GetCostToNode(neighbor, directions[i]);
if (movementCost != InvalidNode)
if (movementCost != Constants.InvalidNode)
validNeighbors.AddLast(new GraphConnection(position, neighbor, movementCost));
}
@@ -137,7 +137,7 @@ namespace OpenRA.Mods.Common.Pathfinder
return CalculateCellCost(destNode, direction, movementCost);
}
return InvalidNode;
return Constants.InvalidNode;
}
int CalculateCellCost(CPos neighborCPos, CVec direction, int movementCost)
@@ -148,7 +148,13 @@ namespace OpenRA.Mods.Common.Pathfinder
cellCost = (cellCost * 34) / 24;
if (CustomCost != null)
cellCost += CustomCost(neighborCPos);
{
var customCost = CustomCost(neighborCPos);
if (customCost == Constants.InvalidNode)
return Constants.InvalidNode;
cellCost += customCost;
}
// directional bonuses for smoother flow!
if (LaneBias != 0)
@@ -184,15 +190,8 @@ namespace OpenRA.Mods.Common.Pathfinder
public CellInfo this[CPos pos]
{
get
{
return cellInfo[pos];
}
set
{
cellInfo[pos] = value;
}
get { return cellInfo[pos]; }
set { cellInfo[pos] = value; }
}
}
}