mirror of
https://github.com/vcmi/vcmi.git
synced 2025-11-25 22:42:04 +02:00
Merge pull request #6021 from kdmcser/undead_raise
make UNDEAD_RAISE_PERCENTAGE compatible with 1.6 when setting to 0
This commit is contained in:
@@ -976,8 +976,9 @@ CStackBasicDescriptor CGHeroInstance::calculateNecromancy (const BattleResult &b
|
|||||||
if (improvedNecromancy->empty())
|
if (improvedNecromancy->empty())
|
||||||
return CStackBasicDescriptor();
|
return CStackBasicDescriptor();
|
||||||
|
|
||||||
|
bool hasRaisedUnitsBonus = hasBonusOfType(BonusType::UNDEAD_RAISE_PERCENTAGE);
|
||||||
int raisedUnitsPercentage = std::clamp(valOfBonuses(BonusType::UNDEAD_RAISE_PERCENTAGE), 0, 100);
|
int raisedUnitsPercentage = std::clamp(valOfBonuses(BonusType::UNDEAD_RAISE_PERCENTAGE), 0, 100);
|
||||||
if (raisedUnitsPercentage == 0)
|
if(raisedUnitsPercentage == 0 && !hasRaisedUnitsBonus)
|
||||||
return CStackBasicDescriptor();
|
return CStackBasicDescriptor();
|
||||||
|
|
||||||
const std::map<CreatureID,si32> &casualties = battleResult.casualties[CBattleInfoEssentials::otherSide(battleResult.winner)];
|
const std::map<CreatureID,si32> &casualties = battleResult.casualties[CBattleInfoEssentials::otherSide(battleResult.winner)];
|
||||||
|
|||||||
Reference in New Issue
Block a user