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

Extend creature siege support. Fix bug #2600

Browse Source
This commit is contained in:
dydzio
2017-02-01 11:25:57 +01:00
parent 76d3c98b85
commit a8f04aede7
4 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/CGameHandler.cpp
View File

@ -3954,7 +3954,15 @@ bool CGameHandler::makeBattleAction(BattleAction &ba)
auto wrapper = wrapAction(ba);
const CGHeroInstance * attackingHero = gs->curB->battleGetFightingHero(ba.side);
CHeroHandler::SBallisticsLevelInfo sbi = VLC->heroh->ballistics.at(attackingHero->getSecSkillLevel(SecondarySkill::BALLISTICS));
CHeroHandler::SBallisticsLevelInfo sbi;
if(stack->getCreature()->idNumber == CreatureID::CATAPULT)
sbi = VLC->heroh->ballistics.at(attackingHero->getSecSkillLevel(SecondarySkill::BALLISTICS));
else //may need to use higher ballistics level for creatures in future for some cases to match original H3 (upgraded cyclops etc)
{
sbi = VLC->heroh->ballistics.at(1);
sbi.shots += std::max(stack->valOfBonuses(Bonus::ADVANCED_CATAPULT), 0);
}
auto wallPart = gs->curB->battleHexToWallPart(ba.destinationTile);
if (!gs->curB->isWallPartPotentiallyAttackable(wallPart))