games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Merge pull request #5727 from IvanSavenko/enchanter

Browse Source 
Remove hardcoded mass-casting of ENCHANTER bonus
This commit is contained in:
Ivan Savenko
2025-05-21 13:52:06 +03:00
committed by GitHub
parent 0fd13a78da c2ae0559ee
commit b806775f3a
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
server/battles/BattleFlowProcessor.cpp
View File

@@ -761,7 +761,7 @@ void BattleFlowProcessor::stackTurnTrigger(const CBattleInfoCallback & battle, c
});
BattleSide side = battle.playerToSide(st->unitOwner());
if(st->canCast() && battle.battleGetEnchanterCounter(side) == 0)
if(st->canCast())
{
bool cast = false;
while(!bl.empty() && !cast)
@@ -773,29 +773,29 @@ void BattleFlowProcessor::stackTurnTrigger(const CBattleInfoCallback & battle, c
{
return b == bonus.get();
});
if (battle.battleGetEnchanterCounter(side) != 0 && bonus->additionalInfo[0] != 0)
continue; // cooldown
spells::BattleCast parameters(&battle, st, spells::Mode::ENCHANTER, spell);
parameters.setSpellLevel(bonus->val);
auto &levelInfo = spell->getLevelInfo(bonus->val);
bool isDamageSpell = spell->isDamage() || spell->isOffensive();
if (!isDamageSpell || levelInfo.smartTarget || !levelInfo.range.empty())
{
parameters.massive = true;
parameters.smart = true;
}
//todo: recheck effect level
if(parameters.castIfPossible(gameHandler->spellEnv, spells::Target(1, spells::Destination())))
if(parameters.castIfPossible(gameHandler->spellEnv, spells::Target(1, parameters.massive ? spells::Destination() : spells::Destination(st))))
{
cast = true;
int cooldown = bonus->additionalInfo[0];
BattleSetStackProperty ssp;
ssp.battleID = battle.getBattle()->getBattleID();
ssp.which = BattleSetStackProperty::ENCHANTER_COUNTER;
ssp.absolute = false;
ssp.val = cooldown;
ssp.stackID = st->unitId();
gameHandler->sendAndApply(ssp);
if (cooldown != 0)
{
BattleSetStackProperty ssp;
ssp.battleID = battle.getBattle()->getBattleID();
ssp.which = BattleSetStackProperty::ENCHANTER_COUNTER;
ssp.absolute = false;
ssp.val = cooldown;
ssp.stackID = st->unitId();
gameHandler->sendAndApply(ssp);
}
}
}
}