games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

Use the same cost value in Pathfinder and fuzzy evaluations.

Browse Source
This commit is contained in:
AlexVinS
2019-01-15 08:52:55 +03:00
parent 4b5910c2f4
commit da20aa2388
14 changed files with 96 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
AI/VCAI/Pathfinding/AINodeStorage.cpp
View File

@@ -120,6 +120,7 @@ CGPathNode * AINodeStorage::getInitialNode()
initialNode->turns = 0;
initialNode->moveRemains = hero->movement;
initialNode->danger = 0;
initialNode->cost = 0.0;
return initialNode;
}
@@ -146,6 +147,7 @@ void AINodeStorage::commit(CDestinationNodeInfo & destination, const PathNodeInf
{
dstNode->moveRemains = destination.movementLeft;
dstNode->turns = destination.turn;
dstNode->cost = destination.cost;
dstNode->danger = srcNode->danger;
dstNode->action = destination.action;
dstNode->theNodeBefore = srcNode->theNodeBefore;
@@ -322,8 +324,7 @@ bool AINodeStorage::hasBetterChain(const PathNodeInfo & source, CDestinationNode
if(node.danger <= destinationNode->danger && destinationNode->chainMask == 1 && node.chainMask == 0)
{
if(node.turns < destinationNode->turns
|| (node.turns == destinationNode->turns && node.moveRemains >= destinationNode->moveRemains))
if(node.cost < destinationNode->cost)
{
#ifdef VCMI_TRACE_PATHFINDER
logAi->trace(
@@ -343,7 +344,6 @@ bool AINodeStorage::hasBetterChain(const PathNodeInfo & source, CDestinationNode
bool AINodeStorage::isTileAccessible(int3 pos, const EPathfindingLayer layer) const
{
std::vector<AIPath> paths;
auto chains = nodes[pos.x][pos.y][pos.z][layer];
for(const AIPathNode & node : chains)
@@ -376,9 +376,7 @@ std::vector<AIPath> AINodeStorage::getChainInfo(int3 pos, bool isOnLand) const
while(current != nullptr && current->coord != initialPos)
{
AIPathNodeInfo pathNode;
pathNode.movementPointsLeft = current->moveRemains;
pathNode.movementPointsUsed = (int)(current->turns * hero->maxMovePoints(true) + hero->movement) - (int)current->moveRemains;
pathNode.cost = current->cost;
pathNode.turns = current->turns;
pathNode.danger = current->danger;
pathNode.coord = current->coord;
@@ -420,15 +418,15 @@ uint64_t AIPath::getPathDanger() const
return 0;
}
uint32_t AIPath::movementCost() const
float AIPath::movementCost() const
{
if(nodes.size())
{
return nodes.front().movementPointsUsed;
return nodes.front().cost;
}
// TODO: boost:optional?
return 0;
return 0.0;
}
uint64_t AIPath::getTotalDanger(HeroPtr hero) const

5
AI/VCAI/Pathfinding/AINodeStorage.h
View File

@@ -42,8 +42,7 @@ struct AIPathNode : public CGPathNode
struct AIPathNodeInfo
{
uint32_t movementPointsLeft;
uint32_t movementPointsUsed;
float cost;
int turns;
int3 coord;
uint64_t danger;
@@ -64,7 +63,7 @@ struct AIPath
int3 firstTileToGet() const;
uint32_t movementCost() const;
float movementCost() const;
};
class AINodeStorage : public INodeStorage