games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

compute movement cost using PathNodeInfo layer info when possible

Browse Source
This commit is contained in:
Andrey Filipenkov
2023-03-19 17:05:38 +03:00
parent a0cd69e944
commit 147633bd9d
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/CPathfinder.cpp
View File

@@ -1215,7 +1215,9 @@ int CPathfinderHelper::getMovementCost(
const TerrainTile * ct, const TerrainTile * ct,
const TerrainTile * dt, const TerrainTile * dt,
const int remainingMovePoints, const int remainingMovePoints,
const bool checkLast) const const bool checkLast,
boost::logic::tribool isDstSailLayer,
boost::logic::tribool isDstWaterLayer) const
{ {
if(src == dst) //same tile if(src == dst) //same tile
return 0; return 0;
@@ -1228,15 +1230,27 @@ int CPathfinderHelper::getMovementCost(
dt = hero->cb->getTile(dst); dt = hero->cb->getTile(dst);
} }
bool isSailLayer;
if(indeterminate(isDstSailLayer))
isSailLayer = hero->boat != nullptr && dt->terType->isWater();
else
isSailLayer = static_cast<bool>(isDstSailLayer);
bool isWaterLayer;
if(indeterminate(isDstWaterLayer))
isWaterLayer = dt->terType->isWater();
else
isWaterLayer = static_cast<bool>(isDstWaterLayer);
int ret = hero->getTileCost(*dt, *ct, ti); int ret = hero->getTileCost(*dt, *ct, ti);
if(hero->boat != nullptr && dt->terType->isWater()) if(isSailLayer)
{ {
if(ct->hasFavorableWinds()) if(ct->hasFavorableWinds())
ret = static_cast<int>(ret * 2.0 / 3); ret = static_cast<int>(ret * 2.0 / 3);
} }
else if(ti->hasBonusOfType(Bonus::FLYING_MOVEMENT)) else if(ti->hasBonusOfType(Bonus::FLYING_MOVEMENT))
vstd::amin(ret, GameConstants::BASE_MOVEMENT_COST + ti->valOfBonuses(Bonus::FLYING_MOVEMENT)); vstd::amin(ret, GameConstants::BASE_MOVEMENT_COST + ti->valOfBonuses(Bonus::FLYING_MOVEMENT));
else if(hero->boat == nullptr && dt->terType->isWater() && ti->hasBonusOfType(Bonus::WATER_WALKING)) else if(isWaterLayer && ti->hasBonusOfType(Bonus::WATER_WALKING))
ret = static_cast<int>(ret * (100.0 + ti->valOfBonuses(Bonus::WATER_WALKING)) / 100.0); ret = static_cast<int>(ret * (100.0 + ti->valOfBonuses(Bonus::WATER_WALKING)) / 100.0);
if(src.x != dst.x && src.y != dst.y) //it's diagonal move if(src.x != dst.x && src.y != dst.y) //it's diagonal move

8
lib/CPathfinder.h
View File

@@ -592,7 +592,9 @@ public:
const TerrainTile * ct, const TerrainTile * ct,
const TerrainTile * dt, const TerrainTile * dt,
const int remainingMovePoints = -1, const int remainingMovePoints = -1,
const bool checkLast = true) const; const bool checkLast = true,
boost::logic::tribool isDstSailLayer = boost::logic::indeterminate,
boost::logic::tribool isDstWaterLayer = boost::logic::indeterminate) const;
int getMovementCost( int getMovementCost(
const PathNodeInfo & src, const PathNodeInfo & src,
@@ -606,7 +608,9 @@ public:
src.tile, src.tile,
dst.tile, dst.tile,
remainingMovePoints, remainingMovePoints,
checkLast checkLast,
dst.node->layer == EPathfindingLayer::SAIL,
dst.node->layer == EPathfindingLayer::WATER
); );
} }