games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Allow hit on any target including already destroyed, allow multiple hit on same target

Browse Source
This commit is contained in:
AlexVinS 2015-03-18 14:12:26 +03:00
parent 69c458e881
commit 729855ff60
1 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lib/spells/BattleSpellMechanics.cpp
View File

@ -182,17 +182,6 @@ void EarthquakeMechanics::applyBattleEffects(const SpellCastEnvironment * env, B
assert(possibleTargets.size() == EWallPart::PARTS_COUNT); assert(possibleTargets.size() == EWallPart::PARTS_COUNT);
vstd::erase_if(possibleTargets, [parameters](EWallPart::EWallPart part)
{
return (parameters.cb->si.wallState[part] == EWallState::DESTROYED) || (parameters.cb->si.wallState[part] == EWallState::NONE);
});
if(0 == possibleTargets.size())
{
env->complain("EarthquakeMechanics: no target to attack");
return;
}
int targetsToAttack = 2; int targetsToAttack = 2;
switch(parameters.spellLvl) switch(parameters.spellLvl)
@ -222,10 +211,41 @@ void EarthquakeMechanics::applyBattleEffects(const SpellCastEnvironment * env, B
ca.attackedParts.push_back(attackInfo); ca.attackedParts.push_back(attackInfo);
possibleTargets.erase(target); //removing creatures in turrets / keep if one is destroyed
BattleHex posRemove;
switch(target)
{
case EWallPart::KEEP:
posRemove = -2;
break;
case EWallPart::BOTTOM_TOWER:
posRemove = -3;
break;
case EWallPart::UPPER_TOWER:
posRemove = -4;
break;
}
if(posRemove != BattleHex::INVALID)
{
BattleStacksRemoved bsr;
for(auto & elem : parameters.cb->stacks)
{
if(elem->position == posRemove)
{
bsr.stackIDs.insert(elem->ID);
break;
}
}
if(bsr.stackIDs.size()>0)
env->sendAndApply(&bsr);
}
targetsToAttack--; targetsToAttack--;
} }
while(targetsToAttack > 0 && possibleTargets.size() > 0); while(targetsToAttack > 0);
env->sendAndApply(&ca); env->sendAndApply(&ca);
} }