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

* added mirth, sorrow, fortune and misfortune spells

Browse Source 
* actual stack's morale/luck is displayed in creature info window
* initialization of morale/luck for siege machines
* removed redundant copies of spell casting code in CGameHandler.cpp
* corrected duration of frenzy spell which was incorrect in certain cases
This commit is contained in:
mateuszb
2009-02-06 11:50:48 +00:00
parent 05b3e3215c
commit 7b2585e422
3 changed files with 114 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
CGameState.cpp
View File

@ -370,14 +370,32 @@ const CStack::StackEffect * CStack::getEffect(ui16 id) const
si8 CStack::Morale() const
{
si8 ret = morale;
//premies from spells/other effects
if(getEffect(49)) //mirth
{
ret += VLC->spellh->spells[49].powers[getEffect(49)->level];
}
if(getEffect(50)) //sorrow
{
ret -= VLC->spellh->spells[50].powers[getEffect(50)->level];
}
if(ret > 3) ret = 3;
if(ret < -3) ret = -3;
return ret;
}
si8 CStack::Luck() const
{
si8 ret = luck;
//premies from spells/other effects
if(getEffect(51)) //fortune
{
ret += VLC->spellh->spells[51].powers[getEffect(51)->level];
}
if(getEffect(52)) //misfortune
{
ret -= VLC->spellh->spells[52].powers[getEffect(52)->level];
}
if(ret > 3) ret = 3;
if(ret < -3) ret = -3;
return ret;
}
CGHeroInstance* CGameState::HeroesPool::pickHeroFor(bool native, int player, const CTown *town, int notThatOne)