1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-15 01:24:45 +02:00

* added mirth, sorrow, fortune and misfortune spells

* 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

View File

@ -1668,6 +1668,26 @@ void CBattleInterface::spellCasted(SpellCasted * sc)
displayEffect(0, sc->tile);
break;
}
case 49: //mirth
{
displayEffect(20, sc->tile);
break;
}
case 50: //sorrow
{
displayEffect(30, sc->tile);
break;
}
case 51: //fortune
{
displayEffect(18, sc->tile);
break;
}
case 52: //misfortune
{
displayEffect(48, sc->tile);
break;
}
case 53: //haste
{
displayEffect(31, sc->tile);
@ -2342,8 +2362,8 @@ void CBattleHex::clickRight(boost::logic::tribool down)
{
pom->attackBonus = h->getPrimSkillLevel(0);
pom->defenseBonus = h->getPrimSkillLevel(1);
pom->luck = h->getCurrentLuck();
pom->morale = h->getCurrentMorale();
pom->luck = myst.Luck();
pom->morale = myst.Morale();
pom->speedBonus = myst.speed() - myst.creature->speed;
}