games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-05-15 22:16:37 +02:00
Code Issues Releases Activity

vcmi: check long bridge by moat

Browse Source 
If moat is on GATE_BRIDGE hex, then it is a long bridge.
No need to check town type.
This commit is contained in:
Konstantin 2023-03-23 01:16:11 +03:00
parent 3bbff0588d
commit a8478a012b
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/CGameHandler.cpp
View File

@ -1341,10 +1341,14 @@ int CGameHandler::moveStack(int stack, BattleHex dest)
ret = path.second; ret = path.second;
int creSpeed = gs->curB->tacticDistance ? GameConstants::BFIELD_SIZE : curStack->Speed(0, true); int creSpeed = gs->curB->tacticDistance ? GameConstants::BFIELD_SIZE : curStack->Speed(0, true);
bool hasWideMoat = vstd::contains_if(battleGetAllObstaclesOnPos(BattleHex(ESiegeHex::GATE_BRIDGE), false), [](const std::shared_ptr<const CObstacleInstance> & obst)
{
return obst->obstacleType == CObstacleInstance::MOAT;
});
auto isGateDrawbridgeHex = [&](BattleHex hex) -> bool auto isGateDrawbridgeHex = [&](BattleHex hex) -> bool
{ {
if (gs->curB->town->subID == ETownType::FORTRESS && hex == ESiegeHex::GATE_BRIDGE) if (hasWideMoat && hex == ESiegeHex::GATE_BRIDGE)
return true; return true;
if (hex == ESiegeHex::GATE_OUTER) if (hex == ESiegeHex::GATE_OUTER)
return true; return true;
@ -1407,7 +1411,7 @@ int CGameHandler::moveStack(int stack, BattleHex dest)
{ {
auto needOpenGates = [&](BattleHex hex) -> bool auto needOpenGates = [&](BattleHex hex) -> bool
{ {
if (gs->curB->town->subID == ETownType::FORTRESS && hex == ESiegeHex::GATE_BRIDGE) if (hasWideMoat && hex == ESiegeHex::GATE_BRIDGE)
return true; return true;
if (hex == ESiegeHex::GATE_BRIDGE && i-1 >= 0 && path.first[i-1] == ESiegeHex::GATE_OUTER) if (hex == ESiegeHex::GATE_BRIDGE && i-1 >= 0 && path.first[i-1] == ESiegeHex::GATE_OUTER)
return true; return true;
@ -1443,7 +1447,7 @@ int CGameHandler::moveStack(int stack, BattleHex dest)
{ {
gateMayCloseAtHex = path.first[i-1]; gateMayCloseAtHex = path.first[i-1];
} }
if (gs->curB->town->subID == ETownType::FORTRESS) if (hasWideMoat)
{ {
if (hex == ESiegeHex::GATE_BRIDGE && i-1 >= 0 && path.first[i-1] != ESiegeHex::GATE_OUTER) if (hex == ESiegeHex::GATE_BRIDGE && i-1 >= 0 && path.first[i-1] != ESiegeHex::GATE_OUTER)
{ {
@ -4418,7 +4422,10 @@ void CGameHandler::updateGateState()
bool hasStackAtGateInner = gs->curB->battleGetStackByPos(BattleHex(ESiegeHex::GATE_INNER), false) != nullptr; bool hasStackAtGateInner = gs->curB->battleGetStackByPos(BattleHex(ESiegeHex::GATE_INNER), false) != nullptr;
bool hasStackAtGateOuter = gs->curB->battleGetStackByPos(BattleHex(ESiegeHex::GATE_OUTER), false) != nullptr; bool hasStackAtGateOuter = gs->curB->battleGetStackByPos(BattleHex(ESiegeHex::GATE_OUTER), false) != nullptr;
bool hasStackAtGateBridge = gs->curB->battleGetStackByPos(BattleHex(ESiegeHex::GATE_BRIDGE), false) != nullptr; bool hasStackAtGateBridge = gs->curB->battleGetStackByPos(BattleHex(ESiegeHex::GATE_BRIDGE), false) != nullptr;
bool hasLongBridge = gs->curB->town->subID == ETownType::FORTRESS; bool hasWideMoat = vstd::contains_if(battleGetAllObstaclesOnPos(BattleHex(ESiegeHex::GATE_BRIDGE), false), [](const std::shared_ptr<const CObstacleInstance> & obst)
{
return obst->obstacleType == CObstacleInstance::MOAT;
});
BattleUpdateGateState db; BattleUpdateGateState db;
db.state = gs->curB->si.gateState; db.state = gs->curB->si.gateState;
@ -4428,7 +4435,7 @@ void CGameHandler::updateGateState()
} }
else if (db.state == EGateState::OPENED) else if (db.state == EGateState::OPENED)
{ {
bool hasStackOnLongBridge = hasStackAtGateBridge && hasLongBridge; bool hasStackOnLongBridge = hasStackAtGateBridge && hasWideMoat;
bool gateCanClose = !hasStackAtGateInner && !hasStackAtGateOuter && !hasStackOnLongBridge; bool gateCanClose = !hasStackAtGateInner && !hasStackAtGateOuter && !hasStackOnLongBridge;
if (gateCanClose) if (gateCanClose)