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

Fix counterattack wrong mechanics

Browse Source
This commit is contained in:
Dydzio 2018-07-18 15:35:31 +02:00
parent 9bd662b2f3
commit d5d2c65c4b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/CGameHandler.cpp
View File

@ -4054,17 +4054,17 @@ bool CGameHandler::makeBattleAction(BattleAction &ba)
//attack //attack
int totalAttacks = stack->totalAttacks.getMeleeValue(); int totalAttacks = stack->totalAttacks.getMeleeValue();
for (int i = 0; i < totalAttacks; ++i)
{
const bool firstStrike = destinationStack->hasBonusOfType(Bonus::FIRST_STRIKE); const bool firstStrike = destinationStack->hasBonusOfType(Bonus::FIRST_STRIKE);
const bool retaliation = destinationStack->ableToRetaliate(); const bool retaliation = destinationStack->ableToRetaliate();
for (int i = 0; i < totalAttacks; ++i)
{
//first strike //first strike
if(i == 0 && firstStrike && retaliation) if(i == 0 && firstStrike && retaliation)
{ {
makeAttack(destinationStack, stack, 0, stack->getPosition(), true, false, true); makeAttack(destinationStack, stack, 0, stack->getPosition(), true, false, true);
} }
//move can cause death, eg. by walking into the moat //move can cause death, eg. by walking into the moat, first strike can cause death as well
if(stack->alive() && destinationStack->alive()) if(stack->alive() && destinationStack->alive())
{ {
makeAttack(stack, destinationStack, (i ? 0 : distance), destinationTile, i==0, false, false);//no distance travelled on second attack makeAttack(stack, destinationStack, (i ? 0 : distance), destinationTile, i==0, false, false);//no distance travelled on second attack
@ -4074,10 +4074,10 @@ bool CGameHandler::makeBattleAction(BattleAction &ba)
//we check retaliation twice, so if it unblocked during attack it will work only on next attack //we check retaliation twice, so if it unblocked during attack it will work only on next attack
if(stack->alive() if(stack->alive()
&& !stack->hasBonusOfType(Bonus::BLOCKS_RETALIATION) && !stack->hasBonusOfType(Bonus::BLOCKS_RETALIATION)
&& (i > 0 || !firstStrike) && (i == 0 && !firstStrike)
&& retaliation && destinationStack->ableToRetaliate()) && retaliation && destinationStack->ableToRetaliate())
{ {
makeAttack(destinationStack, stack, 0, stack->getPosition(), i==0, false, true); makeAttack(destinationStack, stack, 0, stack->getPosition(), true, false, true);
} }
} }