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

Fixed #1035.

Browse Source 
Support for commander artifacts that accumulate bonus after battle.
This commit is contained in:
DjWarmonger
2012-07-16 16:18:02 +00:00
parent 69de38bf1d
commit cf45239332
10 changed files with 408 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/NetPacksLib.cpp
View File

@ -1032,6 +1032,8 @@ DLL_LINKAGE void BattleObstaclePlaced::applyGs( CGameState *gs )
void BattleResult::applyGs( CGameState *gs )
{
//stack with SUMMONED flag but coming from garrison -> most likely resurrected, needs to be removed
//TODO: switch commander status to dead
BOOST_FOREACH(CStack *s, gs->curB->stacks)
{
if(s->base && s->base->armyObj && vstd::contains(s->state, EBattleStackState::SUMMONED))
@ -1043,14 +1045,20 @@ void BattleResult::applyGs( CGameState *gs )
for (unsigned i = 0; i < gs->curB->stacks.size(); i++)
delete gs->curB->stacks[i];
//remove any "until next battle" bonuses
CGHeroInstance *h;
for (int i = 0; i < 2; ++i)
{
h = gs->curB->heroes[i];
h = gs->curB->heroes[i];
if (h)
{
h->getBonusList().remove_if(Bonus::OneBattle);
h->getBonusList().remove_if(Bonus::OneBattle); //remove any "until next battle" bonuses
if (h->commander && h->commander->alive)
{
BOOST_FOREACH (auto art, h->commander->artifactsWorn) //increment bonuses for commander artifacts
{
art.second.artifact->artType->levelUpArtifact (art.second.artifact);
}
}
}
}