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

Merge pull request #4259 from vcmi/fix-4203

Browse Source 
BattleAI: fix moving to unreachable in case of back-to-back 2-hex
This commit is contained in:
Andrii Danylchenko
2024-07-16 16:41:50 +03:00
committed by GitHub
parent ad9750ed3e a4b6fc75dd
commit d243a2fc12
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/battle/ReachabilityInfo.cpp
View File

@@ -66,8 +66,24 @@ uint32_t ReachabilityInfo::distToNearestNeighbour(
if(attacker->doubleWide())
{
vstd::concatenate(attackableHexes, battle::Unit::getHexes(defender->occupiedHex(), true, attacker->unitSide()));
if(defender->doubleWide())
{
// It can be back to back attack o==o or head to head =oo=.
// In case of back-to-back the distance between heads (unit positions) may be up to 3 tiles
vstd::concatenate(attackableHexes, battle::Unit::getHexes(defender->occupiedHex(), true, defender->unitSide()));
}
else
{
vstd::concatenate(attackableHexes, battle::Unit::getHexes(defender->getPosition(), true, defender->unitSide()));
}
}
vstd::removeDuplicates(attackableHexes);
vstd::erase_if(attackableHexes, [defender](BattleHex h) -> bool
{
return h.getY() != defender->getPosition().getY() || !h.isAvailable();
});
return distToNearestNeighbour(attackableHexes, chosenHex);
}