mirror of
https://github.com/vcmi/vcmi.git
synced 2025-11-27 22:49:25 +02:00
Fix handling of upgrades of upgrades for necromancy
Game will now recognize upgrades of upgrades for Necromancy purposes - if hero has such units in his army, Necromancy can target them with same 2/3 efficiency like direct upgrades
This commit is contained in:
@@ -1033,11 +1033,11 @@ CStackBasicDescriptor CGHeroInstance::calculateNecromancy (const BattleResult &b
|
||||
// raise upgraded creature (at 2/3 rate) if no space available otherwise
|
||||
if(getSlotFor(creatureTypeRaised) == SlotID())
|
||||
{
|
||||
for(const CreatureID & upgraded : creatureTypeRaised.toCreature()->upgrades)
|
||||
for (const auto & slot : Slots())
|
||||
{
|
||||
if(getSlotFor(upgraded) != SlotID())
|
||||
if (creatureTypeRaised.toCreature()->isMyDirectOrIndirectUpgrade(slot.second->getCreature()))
|
||||
{
|
||||
creatureTypeRaised = upgraded;
|
||||
creatureTypeRaised = slot.second->getCreatureID();
|
||||
necromancySkill *= 2/3.0;
|
||||
break;
|
||||
}
|
||||
@@ -1060,12 +1060,6 @@ CStackBasicDescriptor CGHeroInstance::calculateNecromancy (const BattleResult &b
|
||||
return CStackBasicDescriptor();
|
||||
}
|
||||
|
||||
/*
|
||||
int3 CGHeroInstance::getSightCenter() const
|
||||
{
|
||||
return getPosition(false);
|
||||
}*/
|
||||
|
||||
int CGHeroInstance::getSightRadius() const
|
||||
{
|
||||
return valOfBonuses(BonusType::SIGHT_RADIUS); // scouting gives SIGHT_RADIUS bonus
|
||||
|
||||
Reference in New Issue
Block a user