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

Fix obstacles escaping for twohex creatures

Browse Source
This commit is contained in:
Andrii Danylchenko
2020-11-21 22:57:01 +02:00
parent af192b8efe
commit 211a993c44
2 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/battle/CBattleInfoCallback.cpp
View File

@@ -1179,17 +1179,8 @@ ReachabilityInfo CBattleInfoCallback::makeBFS(const AccessibilityInfo &accessibi
hexq.pop(); hexq.pop();
//walking stack can't step past the obstacles //walking stack can't step past the obstacles
//TODO what if second hex of two-hex creature enters obstacles if(curHex != params.startPosition && isInObstacle(curHex, obstacles, params))
if(curHex != params.startPosition && vstd::contains(obstacles, curHex))
{
if(curHex == ESiegeHex::GATE_BRIDGE)
{
if(battleGetGateState() != EGateState::DESTROYED && params.side == BattleSide::ATTACKER)
continue; continue;
}
else
continue;
}
const int costToNeighbour = ret.distances[curHex.hex] + 1; const int costToNeighbour = ret.distances[curHex.hex] + 1;
for(BattleHex neighbour : BattleHex::neighbouringTilesCache[curHex.hex]) for(BattleHex neighbour : BattleHex::neighbouringTilesCache[curHex.hex])
@@ -1211,6 +1202,31 @@ ReachabilityInfo CBattleInfoCallback::makeBFS(const AccessibilityInfo &accessibi
return ret; return ret;
} }
bool CBattleInfoCallback::isInObstacle(
BattleHex hex,
const std::set<BattleHex> & obstacles,
const ReachabilityInfo::Parameters & params) const
{
auto occupiedHexes = battle::Unit::getHexes(hex, params.doubleWide, params.side);
for(auto occupiedHex : occupiedHexes)
{
if(vstd::contains(obstacles, occupiedHex))
{
if(occupiedHex == ESiegeHex::GATE_BRIDGE)
{
if(battleGetGateState() != EGateState::DESTROYED && params.side == BattleSide::ATTACKER)
return true;
}
else
return true;
}
}
return false;
}
std::set<BattleHex> CBattleInfoCallback::getStoppers(BattlePerspective::BattlePerspective whichSidePerspective) const std::set<BattleHex> CBattleInfoCallback::getStoppers(BattlePerspective::BattlePerspective whichSidePerspective) const
{ {
std::set<BattleHex> ret; std::set<BattleHex> ret;

1
lib/battle/CBattleInfoCallback.h
View File

@@ -142,5 +142,6 @@ public:
protected: protected:
ReachabilityInfo getFlyingReachability(const ReachabilityInfo::Parameters & params) const; ReachabilityInfo getFlyingReachability(const ReachabilityInfo::Parameters & params) const;
ReachabilityInfo makeBFS(const AccessibilityInfo & accessibility, const ReachabilityInfo::Parameters & params) const; ReachabilityInfo makeBFS(const AccessibilityInfo & accessibility, const ReachabilityInfo::Parameters & params) const;
bool isInObstacle(BattleHex hex, const std::set<BattleHex> & obstacles, const ReachabilityInfo::Parameters & params) const;
std::set<BattleHex> getStoppers(BattlePerspective::BattlePerspective whichSidePerspective) const; //get hexes with stopping obstacles (quicksands) std::set<BattleHex> getStoppers(BattlePerspective::BattlePerspective whichSidePerspective) const; //get hexes with stopping obstacles (quicksands)
}; };