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

* morale/luck support in battles

Browse Source 
* minor improvements/fixes
* updated changelog
More objects supported:
 *	Faerie Ring
 *	Swan Pond
 *	Idol of Fortune
 *	Fountain of Fortune
 *	Rally Flag
 *	Oasis
 *	Temple
 *	Watering Hole
 *	Fountain of Youth
This commit is contained in:
Michał W. Urbańczyk
2009-02-05 09:49:45 +00:00
parent 218a3beaf6
commit e1d6ff54d7
15 changed files with 325 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
CGameState.cpp
View File

@ -362,6 +362,20 @@ const CStack::StackEffect * CStack::getEffect(ui16 id) const
return &effects[i];
return NULL;
}
si8 CStack::Morale() const
{
si8 ret = morale;
//premies from spells/other effects
return ret;
}
si8 CStack::Luck() const
{
si8 ret = luck;
//premies from spells/other effects
return ret;
}
CGHeroInstance* CGameState::HeroesPool::pickHeroFor(bool native, int player, const CTown *town, int notThatOne)
{
if(player<0 || player>=PLAYER_LIMIT)
@ -781,14 +795,14 @@ void CGameState::applyNL(IPack * pack)
{
BattleSetActiveStack *ns = static_cast<BattleSetActiveStack*>(pack);
curB->activeStack = ns->stack;
CStack *st = curB->getStack(ns->stack);
if(vstd::contains(st->state,MOVED))
st->state.insert(HAD_MORALE);
break;
}
case 3003:
{
BattleResult *br = static_cast<BattleResult*>(pack);
//TODO: give exp, artifacts to winner, decrease armies (casualties)
for(unsigned i=0;i<curB->stacks.size();i++)
delete curB->stacks[i];
delete curB;
@ -834,7 +848,7 @@ void CGameState::applyNL(IPack * pack)
case 8:
st->state.insert(WAITING);
break;
case 2: case 6: case 7: case 9: case 10:
case 2: case 6: case 7: case 9: case 10: case 11:
st->state.insert(MOVED);
break;
}