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

Possibly fixed http://bugs.vcmi.eu/view.php?id=2291

Browse Source
This commit is contained in:
AlexVinS 2016-09-29 18:55:07 +03:00
parent fed26e1ac9
commit d195bfb62d
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/spells/BattleSpellMechanics.cpp
View File

@ -782,23 +782,40 @@ bool SacrificeMechanics::requiresCreatureTarget() const
///SpecialRisingSpellMechanics
ESpellCastProblem::ESpellCastProblem SpecialRisingSpellMechanics::canBeCast(const CBattleInfoCallback * cb, const SpellTargetingContext & ctx) const
{
//find our possible target here
const CStack * stackToHeal = cb->getStackIf([ctx](const CStack * s)
//find alive possible target
const CStack * stackToHeal = cb->getStackIf([ctx, this](const CStack * s)
{
const bool ownerMatches = !ctx.ti.smart || s->getOwner() == ctx.caster->getOwner();
return ownerMatches && s->isValidTarget(!ctx.ti.onlyAlive) && s->coversPos(ctx.destination);
return ownerMatches && s->isValidTarget(false) && s->coversPos(ctx.destination) && ESpellCastProblem::OK == owner->isImmuneByStack(ctx.caster, s);
});
//find if there is stack preventing cast
const CStack * enemyStack = cb->getStackIf([ctx](const CStack * s)
if(nullptr == stackToHeal)
{
const bool ownerMatches = ctx.ti.smart && s->getOwner() != ctx.caster->getOwner();
//find dead possible target if there is no alive target
stackToHeal = cb->getStackIf([ctx, this](const CStack * s)
{
const bool ownerMatches = !ctx.ti.smart || s->getOwner() == ctx.caster->getOwner();
return ownerMatches && s->isValidTarget(true) && s->coversPos(ctx.destination);
});
return ownerMatches && s->isValidTarget(true) && s->coversPos(ctx.destination) && ESpellCastProblem::OK == owner->isImmuneByStack(ctx.caster, s);
});
if(nullptr == stackToHeal || nullptr != enemyStack)
//we have found dead target
if(nullptr != stackToHeal)
{
for(const BattleHex & hex : stackToHeal->getHexes())
{
const CStack * other = cb->getStackIf([hex, stackToHeal](const CStack * s)
{
return s->isValidTarget(false) && s->coversPos(hex) && s != stackToHeal;
});
if(nullptr != other)
return ESpellCastProblem::NO_APPROPRIATE_TARGET;//alive stack blocks resurrection
}
}
}
if(nullptr == stackToHeal)
return ESpellCastProblem::NO_APPROPRIATE_TARGET;
return ESpellCastProblem::OK;