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

Include bonus from artifacts to Ballista damage, unify code

Browse Source
This commit is contained in:
Ivan Savenko
2025-04-14 15:50:10 +03:00
parent 1cb5f36ccb
commit db2e4c5f6d
3 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
client/windows/CCreatureWindow.cpp
View File

@@ -592,18 +592,17 @@ CStackWindow::MainSection::MainSection(CStackWindow * owner, int yOffset, bool s
name = std::make_shared<CLabel>(215, 13, FONT_SMALL, ETextAlignment::CENTER, Colors::YELLOW, parent->info->getName());
const BattleInterface* battleInterface = GAME->interface()->battleInt.get();
const CStack* battleStack = parent->info->stack;
int dmgMultiply = 1;
if (battleInterface && battleInterface->getBattle() != nullptr && battleStack->hasBonusOfType(BonusType::SIEGE_WEAPON))
if (battleStack != nullptr && battleStack->hasBonusOfType(BonusType::SIEGE_WEAPON))
{
// Determine the relevant hero based on the unit side
const auto hero = (battleStack->unitSide() == BattleSide::ATTACKER)
? battleInterface->attackingHeroInstance
: battleInterface->defendingHeroInstance;
static const auto bonusSelector =
Selector::sourceTypeSel(BonusSource::ARTIFACT).Or(
Selector::sourceTypeSel(BonusSource::HERO_BASE_SKILL)).And(
Selector::typeSubtype(BonusType::PRIMARY_SKILL, BonusSubtypeID(PrimarySkill::ATTACK)));
dmgMultiply += hero->getPrimSkillLevel(PrimarySkill::ATTACK);
dmgMultiply += battleStack->valOfBonuses(bonusSelector);
}
icons = std::make_shared<CPicture>(ImagePath::builtin("stackWindow/icons"), 117, 32);