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

Fixes #1304 - correct battle log message on spellcast without kills

Browse Source
This commit is contained in:
Ivan Savenko 2023-01-07 19:52:57 +02:00
parent 9895dca615
commit 481f756b51
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/spells/effects/Damage.cpp
View File

@ -182,32 +182,32 @@ void Damage::describeEffect(std::vector<MetaString> & log, const Mechanics * m,
{ {
{ {
MetaString line; MetaString line;
line.addTxt(MetaString::GENERAL_TXT, 376); line.addTxt(MetaString::GENERAL_TXT, 376); // Spell %s does %d damage
line.addReplacement(MetaString::SPELL_NAME, m->getSpellIndex()); line.addReplacement(MetaString::SPELL_NAME, m->getSpellIndex());
line.addReplacement((int)damage); line.addReplacement((int)damage);
log.push_back(line); log.push_back(line);
} }
if (kills > 0)
{ {
MetaString line; MetaString line;
const int textId = (kills > 1) ? 379 : 378;
line.addTxt(MetaString::GENERAL_TXT, textId);
if(kills > 1)
line.addReplacement(kills);
if(kills > 1) if(kills > 1)
{ {
line.addTxt(MetaString::GENERAL_TXT, 379); // %d %s perishes
line.addReplacement(kills);
if(multiple) if(multiple)
line.addReplacement(MetaString::GENERAL_TXT, 43); line.addReplacement(MetaString::GENERAL_TXT, 43); // creatures
else else
firstTarget->addNameReplacement(line, true); firstTarget->addNameReplacement(line, true);
} }
else else // single creature killed
{ {
line.addTxt(MetaString::GENERAL_TXT, 378); // one %s perishes
if(multiple) if(multiple)
line.addReplacement(MetaString::GENERAL_TXT, 42); line.addReplacement(MetaString::GENERAL_TXT, 42); // creature
else else
firstTarget->addNameReplacement(line, false); firstTarget->addNameReplacement(line, false);
} }