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

ENCHANTER_CASTING trigger tweak

Browse Source
This commit is contained in:
AlexVinS
2017-06-05 21:41:27 +03:00
parent 66cfc2fef9
commit 1d1519db5c
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/CGameHandler.cpp
View File

@@ -4631,14 +4631,14 @@ void CGameHandler::stackTurnTrigger(const CStack *st)
const CSpell * spell = SpellID(spellID).toSpell();
bl.remove_if([&bonus](const Bonus* b){return b==bonus.get();});
if (gs->curB->battleCanCastThisSpell(st, spell, ECastingMode::ENCHANTER_CASTING) == ESpellCastProblem::OK)
{
BattleSpellCastParameters parameters(gs->curB, st, spell);
parameters.spellLvl = bonus->val;
parameters.effectLevel = bonus->val;//todo: recheck
parameters.mode = ECastingMode::ENCHANTER_CASTING;
parameters.cast(spellEnv);
BattleSpellCastParameters parameters(gs->curB, st, spell);
parameters.spellLvl = bonus->val;
parameters.effectLevel = bonus->val;//todo: recheck
parameters.mode = ECastingMode::ENCHANTER_CASTING;
cast = parameters.castIfPossible(spellEnv);
if(cast)
{
//todo: move to mechanics
BattleSetStackProperty ssp;
ssp.which = BattleSetStackProperty::ENCHANTER_COUNTER;
@@ -4646,8 +4646,6 @@ void CGameHandler::stackTurnTrigger(const CStack *st)
ssp.val = bonus->additionalInfo; //increase cooldown counter
ssp.stackID = st->ID;
sendAndApply(&ssp);
cast = true;
}
}
}