games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-03 00:46:55 +02:00
Code Issues Releases Activity

* bug 97 fixed

Browse Source 
* better handling of BLOCK_SPELLS_ABOVE_LEVEL bonus
This commit is contained in:
mateuszb
2011-02-21 13:27:31 +00:00
parent d36f8087aa
commit 43468e16e1
4 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/BattleState.cpp
View File

@ -1171,29 +1171,16 @@ const CGHeroInstance * BattleInfo::battleGetOwner(const CStack * stack) const
si8 BattleInfo::battleMaxSpellLevel() const
{
// if(!curB) //there is not battle
// {
// tlog1 << "si8 CGameState::maxSpellLevel() call when there is no battle!" << std::endl;
// throw "si8 CGameState::maxSpellLevel() call when there is no battle!";
// }
si8 levelLimit = SPELL_LEVELS;
const CGHeroInstance *h1 = heroes[0];
if(h1)
if(const CGHeroInstance *h1 = heroes[0])
{
BOOST_FOREACH(const Bonus *i, h1->bonuses)
if(i->type == Bonus::BLOCK_SPELLS_ABOVE_LEVEL)
amin(levelLimit, i->val);
amin(levelLimit, h1->valOfBonuses(Bonus::BLOCK_SPELLS_ABOVE_LEVEL));
}
const CGHeroInstance *h2 = heroes[1];
if(h2)
if(const CGHeroInstance *h2 = heroes[1])
{
BOOST_FOREACH(const Bonus *i, h2->bonuses)
if(i->type == Bonus::BLOCK_SPELLS_ABOVE_LEVEL)
amin(levelLimit, i->val);
amin(levelLimit, h2->valOfBonuses(Bonus::BLOCK_SPELLS_ABOVE_LEVEL));
}
return levelLimit;
@ -1473,6 +1460,10 @@ BattleInfo * BattleInfo::setupBattle( int3 tile, int terrain, int terType, const
}
}
//spell level limiting bonus
curB->addNewBonus(new Bonus(Bonus::ONE_BATTLE, Bonus::BLOCK_SPELLS_ABOVE_LEVEL, Bonus::OTHER,
SPELL_LEVELS, -1, -1, Bonus::INDEPENDENT_MIN));;
//giving terrain overalay premies
int bonusSubtype = -1;
switch(terType)
@ -1524,7 +1515,9 @@ BattleInfo * BattleInfo::setupBattle( int3 tile, int terrain, int terType, const
{
curB->addNewBonus(makeFeature(Bonus::NO_MORALE, Bonus::ONE_BATTLE, 0, 0, Bonus::TERRAIN_OVERLAY));
curB->addNewBonus(makeFeature(Bonus::NO_LUCK, Bonus::ONE_BATTLE, 0, 0, Bonus::TERRAIN_OVERLAY));
curB->addNewBonus(makeFeature(Bonus::BLOCK_SPELLS_ABOVE_LEVEL, Bonus::ONE_BATTLE, 0, 1, Bonus::TERRAIN_OVERLAY));
Bonus * b = makeFeature(Bonus::BLOCK_SPELLS_ABOVE_LEVEL, Bonus::ONE_BATTLE, 0, 1, Bonus::TERRAIN_OVERLAY);
b->valType = Bonus::INDEPENDENT_MIN;
curB->addNewBonus(b);
break;
}
}