games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-16 02:47:36 +02:00
Code Issues Releases Activity

Fix spell school immunity evaluation

Browse Source
This commit is contained in:
AlexVinS 2014-11-13 14:10:25 +03:00
parent ce8fa33efc
commit 00013ed31a
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/CSpellHandler.cpp
View File

@ -366,25 +366,22 @@ ESpellCastProblem::ESpellCastProblem CSpell::isImmuneBy(const IBonusBearer* obj)
return ESpellCastProblem::STACK_IMMUNE_TO_SPELL; return ESpellCastProblem::STACK_IMMUNE_TO_SPELL;
} }
auto battleTestElementalImmunity = [&,this](Bonus::BonusType element) -> bool
{
if(obj->hasBonusOfType(element, 0)) //always resist if immune to all spells altogether
return ESpellCastProblem::STACK_IMMUNE_TO_SPELL;
else if(!isPositive()) //negative or indifferent
{
if((isDamageSpell() && obj->hasBonusOfType(element, 2)) || obj->hasBonusOfType(element, 1))
return ESpellCastProblem::STACK_IMMUNE_TO_SPELL;
}
return ESpellCastProblem::NOT_DECIDED;
};
//6. Check elemental immunities //6. Check elemental immunities
for(const SpellSchoolInfo & cnf : spellSchoolConfig) for(const SpellSchoolInfo & cnf : spellSchoolConfig)
{ {
if(school.at(cnf.id)) if(school.at(cnf.id))
if(battleTestElementalImmunity(cnf.immunityBonus)) {
return ESpellCastProblem::STACK_IMMUNE_TO_SPELL; auto element = cnf.immunityBonus;
if(obj->hasBonusOfType(element, 0)) //always resist if immune to all spells altogether
return ESpellCastProblem::STACK_IMMUNE_TO_SPELL;
else if(!isPositive()) //negative or indifferent
{
if((isDamageSpell() && obj->hasBonusOfType(element, 2)) || obj->hasBonusOfType(element, 1))
return ESpellCastProblem::STACK_IMMUNE_TO_SPELL;
}
}
} }