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

move checks for invincible bonus to UnitState & cache

Browse Source
This commit is contained in:
Ivan Savenko
2025-01-10 21:15:37 +00:00
parent 5cff9af236
commit 48473b18f6
12 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/battles/BattleActionProcessor.cpp
View File

@@ -276,7 +276,7 @@ bool BattleActionProcessor::doAttackAction(const CBattleInfoCallback & battle, c
for (int i = 0; i < totalAttacks; ++i)
{
//first strike
if(i == 0 && firstStrike && retaliation && !stack->hasBonusOfType(BonusType::BLOCKS_RETALIATION) && !stack->hasBonusOfType(BonusType::INVINCIBLE))
if(i == 0 && firstStrike && retaliation && !stack->hasBonusOfType(BonusType::BLOCKS_RETALIATION) && !stack->isInvincible())
{
makeAttack(battle, destinationStack, stack, 0, stack->getPosition(), true, false, true);
}
@@ -303,7 +303,7 @@ bool BattleActionProcessor::doAttackAction(const CBattleInfoCallback & battle, c
//we check retaliation twice, so if it unblocked during attack it will work only on next attack
if(stack->alive()
&& !stack->hasBonusOfType(BonusType::BLOCKS_RETALIATION)
&& !stack->hasBonusOfType(BonusType::INVINCIBLE)
&& !stack->isInvincible()
&& (i == 0 && !firstStrike)
&& retaliation && destinationStack->ableToRetaliate())
{