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

Fixed https://bugs.vcmi.eu/view.php?id=2865

Browse Source
This commit is contained in:
AlexVinS
2018-02-10 00:02:56 +03:00
parent 0a2b04709f
commit b194f8f13b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/CGameHandler.cpp
View File

@@ -4137,10 +4137,9 @@ bool CGameHandler::makeBattleAction(BattleAction &ba)
for (int i = 0; i < totalAttacks; ++i) 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();
//first strike //first strike
if(i == 0 && firstStrike if(i == 0 && firstStrike && retaliation)
&& destinationStack->ableToRetaliate()
&& stack->alive()) //probably not needed
{ {
makeAttack(destinationStack, stack, 0, stack->getPosition(), true, false, true); makeAttack(destinationStack, stack, 0, stack->getPosition(), true, false, true);
} }
@@ -4152,10 +4151,11 @@ bool CGameHandler::makeBattleAction(BattleAction &ba)
} }
//counterattack //counterattack
//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)
&& destinationStack->ableToRetaliate()) && retaliation && destinationStack->ableToRetaliate())
{ {
makeAttack(destinationStack, stack, 0, stack->getPosition(), i==0, false, true); makeAttack(destinationStack, stack, 0, stack->getPosition(), i==0, false, true);
} }