games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-14 02:33:51 +02:00
Code Issues Releases Activity

Display actual moral and luck for batlle stack

Browse Source
This commit is contained in:
AlexVinS 2017-07-14 21:42:36 +03:00
parent 9586fd9b0a
commit 2fb531b6d0
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/windows/CCreatureWindow.cpp
View File

@ -226,6 +226,9 @@ void CStackWindow::CWindowSection::createStackInfo(bool showExp, bool showArt)
const CStack * battleStack = parent->info->stack; const CStack * battleStack = parent->info->stack;
auto morale = new MoraleLuckBox(true, genRect(42, 42, 321, 110));
auto luck = new MoraleLuckBox(false, genRect(42, 42, 375, 110));
if(battleStack != nullptr) // in battle if(battleStack != nullptr) // in battle
{ {
printStatBase(EStat::ATTACK, CGI->generaltexth->primarySkillNames[0], parent->info->creature->Attack(), battleStack->Attack()); printStatBase(EStat::ATTACK, CGI->generaltexth->primarySkillNames[0], parent->info->creature->Attack(), battleStack->Attack());
@ -239,6 +242,9 @@ void CStackWindow::CWindowSection::createStackInfo(bool showExp, bool showArt)
if(battleStack->isCaster()) if(battleStack->isCaster())
printStatBase(EStat::MANA, CGI->generaltexth->allTexts[399], battleStack->casts.total(), battleStack->casts.available()); printStatBase(EStat::MANA, CGI->generaltexth->allTexts[399], battleStack->casts.total(), battleStack->casts.available());
printStat(EStat::HEALTH_LEFT, CGI->generaltexth->allTexts[200], battleStack->getFirstHPleft()); printStat(EStat::HEALTH_LEFT, CGI->generaltexth->allTexts[200], battleStack->getFirstHPleft());
morale->set(battleStack);
luck->set(battleStack);
} }
else else
{ {
@ -255,12 +261,10 @@ void CStackWindow::CWindowSection::createStackInfo(bool showExp, bool showArt)
printStat(EStat::SHOTS, CGI->generaltexth->allTexts[198], parent->info->stackNode->valOfBonuses(Bonus::SHOTS)); printStat(EStat::SHOTS, CGI->generaltexth->allTexts[198], parent->info->stackNode->valOfBonuses(Bonus::SHOTS));
if(caster) if(caster)
printStat(EStat::MANA, CGI->generaltexth->allTexts[399], parent->info->stackNode->valOfBonuses(Bonus::CASTS)); printStat(EStat::MANA, CGI->generaltexth->allTexts[399], parent->info->stackNode->valOfBonuses(Bonus::CASTS));
}
auto morale = new MoraleLuckBox(true, genRect(42, 42, 321, 110)); morale->set(parent->info->stackNode);
morale->set(parent->info->stackNode); luck->set(parent->info->stackNode);
auto luck = new MoraleLuckBox(false, genRect(42, 42, 375, 110)); }
luck->set(parent->info->stackNode);
if (showExp) if (showExp)
{ {