From 87a88da3a97bc31af0844a3d09934c6d9a8dff0d Mon Sep 17 00:00:00 2001 From: Andrey Filipenkov Date: Wed, 21 Sep 2022 10:42:42 +0300 Subject: [PATCH] add Fire Shield damage to the battle log --- server/CGameHandler.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/server/CGameHandler.cpp b/server/CGameHandler.cpp index 7c3d97dcf..9c5cd027f 100644 --- a/server/CGameHandler.cpp +++ b/server/CGameHandler.cpp @@ -1159,8 +1159,6 @@ void CGameHandler::makeAttack(const CStack * attacker, const CStack * defender, blm.lines.push_back(std::move(text)); } - sendAndApply(&blm); - if(!fireShield.empty()) { //todo: this should be "virtual" spell instead, we only need fire spell school bonus here @@ -1199,9 +1197,20 @@ void CGameHandler::makeAttack(const CStack * attacker, const CStack * defender, StacksInjured pack; pack.stacks.push_back(bsa); sendAndApply(&pack); - sendGenericKilledLog(attacker, bsa.killedAmount, false); + + // TODO: this is already implemented in Damage::describeEffect() + { + MetaString text; + text.addTxt(MetaString::GENERAL_TXT, 376); + text.addReplacement(MetaString::SPELL_NAME, SpellID::FIRE_SHIELD); + text.addReplacement(totalDamage); + blm.lines.push_back(std::move(text)); + } + addGenericKilledLog(blm, attacker, bsa.killedAmount, false); } + sendAndApply(&blm); + handleAfterAttackCasting(ranged, attacker, defender); }