games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity

Merge pull request #9 from alexvins/issue/1763

Browse Source 
Try to fix #1763 and a small refactoring
This commit is contained in:
DjWarmonger 2014-05-17 10:35:28 +02:00
commit 573293d425
1 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
lib/CBattleCallback.cpp
View File

@ -2018,7 +2018,7 @@ ui32 CBattleInfoCallback::calculateSpellDmg( const CSpell * sp, const CGHeroInst
std::set<const CStack*> CBattleInfoCallback::getAffectedCreatures(const CSpell * spell, int skillLevel, PlayerColor attackerOwner, BattleHex destinationTile) std::set<const CStack*> CBattleInfoCallback::getAffectedCreatures(const CSpell * spell, int skillLevel, PlayerColor attackerOwner, BattleHex destinationTile)
{ {
std::set<const CStack*> attackedCres; /*std::set to exclude multiple occurrences of two hex creatures*/ std::set<const CStack*> attackedCres; //std::set to exclude multiple occurrences of two hex creatures
const ui8 attackerSide = playerToSide(attackerOwner) == 1; const ui8 attackerSide = playerToSide(attackerOwner) == 1;
const auto attackedHexes = spell->rangeInHexes(destinationTile, skillLevel, attackerSide); const auto attackedHexes = spell->rangeInHexes(destinationTile, skillLevel, attackerSide);
@ -2090,32 +2090,52 @@ std::set<const CStack*> CBattleInfoCallback::getAffectedCreatures(const CSpell *
} }
else if(spell->getTargetType() == CSpell::CREATURE) else if(spell->getTargetType() == CSpell::CREATURE)
{ {
//start with all stacks.
TStacks stacks = battleGetAllStacks();
//for single target spells remove stacks from other hexes
if(!ti.massive)
{
vstd::erase_if(stacks,[&](const CStack * stack){
return !vstd::contains(stack->getHexes(), destinationTile);
});
}
//now handle smart targeting and remove invalid targets
const bool smartNegative = ti.smart && spell->isNegative();
const bool smartPositive = ti.smart && spell->isPositive();
vstd::erase_if(stacks,[&](const CStack * stack){
const bool negativeToAlly = smartNegative && stack->owner == attackerOwner;
const bool positiveToEnemy = smartPositive && stack->owner != attackerOwner;
const bool invalidTarget = !stack->isValidTarget(!onlyAlive); //todo: this should be handled by spell class
return negativeToAlly || positiveToEnemy || invalidTarget;
});
if (ti.massive) if (ti.massive)
{ {
TStacks stacks = battleGetAllStacks(); //for massive spells add all remaining targets
vstd::erase_if(stacks,[&](const CStack * stack){
return ti.smart && spell->isNegative() && stack->owner == attackerOwner;
});
vstd::erase_if(stacks,[&](const CStack * stack){
return ti.smart && spell->isPositive() && stack->owner != attackerOwner;
});
vstd::erase_if(stacks,[&](const CStack * stack){
return !stack->isValidTarget(!onlyAlive);
});
for (auto stack : stacks) for (auto stack : stacks)
attackedCres.insert(stack); attackedCres.insert(stack);
} }
else else
{ {
if(const CStack * st = battleGetStackByPos(destinationTile, onlyAlive)) //for single target spells we must select one target. Alive stack is preferred (issue #1763)
attackedCres.insert(st); for(auto stack : stacks)
{
if(stack->alive())
{
attackedCres.insert(stack);
break;
}
}
if(attackedCres.empty() && !stacks.empty())
{
attackedCres.insert(stacks.front());
}
} }
} }
else //custom range from attackedHexes else //custom range from attackedHexes
{ {