From 481f756b51a3a71b023107de96f532b92e9dc24c Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Sat, 7 Jan 2023 19:52:57 +0200 Subject: [PATCH] Fixes #1304 - correct battle log message on spellcast without kills --- lib/spells/effects/Damage.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/spells/effects/Damage.cpp b/lib/spells/effects/Damage.cpp index 9941be671..c9c9dc0b4 100644 --- a/lib/spells/effects/Damage.cpp +++ b/lib/spells/effects/Damage.cpp @@ -182,32 +182,32 @@ void Damage::describeEffect(std::vector & log, const Mechanics * m, { { 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((int)damage); log.push_back(line); } + if (kills > 0) { MetaString line; - const int textId = (kills > 1) ? 379 : 378; - line.addTxt(MetaString::GENERAL_TXT, textId); - - if(kills > 1) - line.addReplacement(kills); if(kills > 1) { + line.addTxt(MetaString::GENERAL_TXT, 379); // %d %s perishes + line.addReplacement(kills); + if(multiple) - line.addReplacement(MetaString::GENERAL_TXT, 43); + line.addReplacement(MetaString::GENERAL_TXT, 43); // creatures else firstTarget->addNameReplacement(line, true); } - else + else // single creature killed { + line.addTxt(MetaString::GENERAL_TXT, 378); // one %s perishes if(multiple) - line.addReplacement(MetaString::GENERAL_TXT, 42); + line.addReplacement(MetaString::GENERAL_TXT, 42); // creature else firstTarget->addNameReplacement(line, false); }