games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-13 11:40:38 +02:00
Code Issues Releases Activity

Do not show preview for ranged retaliation - not implemented in lib

Browse Source
This commit is contained in:
Ivan Savenko 2024-05-10 19:51:36 +00:00
parent 6d25c08561
commit 278e8ac65e
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
client/battle/BattleActionsController.cpp
View File

@ -124,8 +124,8 @@ static std::string formatRetaliation(const DamageEstimation & estimation, bool m
"vcmi.battleWindow.damageRetaliation.damageKills"; "vcmi.battleWindow.damageRetaliation.damageKills";
std::string prefixTextID = mayBeKilled ? std::string prefixTextID = mayBeKilled ?
"vcmi.battleWindow.damageRetaliation.will" : "vcmi.battleWindow.damageRetaliation.may" :
"vcmi.battleWindow.damageRetaliation.may"; "vcmi.battleWindow.damageRetaliation.will";
return CGI->generaltexth->translate(prefixTextID) + formatAttack(estimation, "", baseTextID, 0); return CGI->generaltexth->translate(prefixTextID) + formatAttack(estimation, "", baseTextID, 0);
} }
@ -517,14 +517,7 @@ std::string BattleActionsController::actionGetStatusMessage(PossiblePlayerBattle
DamageEstimation estimation = owner.getBattle()->battleEstimateDamage(shooter, targetStack, shooter->getPosition(), &retaliation); DamageEstimation estimation = owner.getBattle()->battleEstimateDamage(shooter, targetStack, shooter->getPosition(), &retaliation);
estimation.kills.max = std::min<int64_t>(estimation.kills.max, targetStack->getCount()); estimation.kills.max = std::min<int64_t>(estimation.kills.max, targetStack->getCount());
estimation.kills.min = std::min<int64_t>(estimation.kills.min, targetStack->getCount()); estimation.kills.min = std::min<int64_t>(estimation.kills.min, targetStack->getCount());
bool enemyMayBeKilled = estimation.kills.max == targetStack->getCount(); return formatRangedAttack(estimation, targetStack->getName(), shooter->shots.available());
bool mayRetaliate = retaliation.damage.max > 0;
// for ranged attacks only show retaliation info if retaliation actually happens - since most shooters don't retaliate
if (mayRetaliate)
return formatRangedAttack(estimation, targetStack->getName(), shooter->shots.available()) + "\n" + formatRetaliation(retaliation, enemyMayBeKilled);
else
return formatRangedAttack(estimation, targetStack->getName(), shooter->shots.available());
} }
case PossiblePlayerBattleAction::AIMED_SPELL_CREATURE: case PossiblePlayerBattleAction::AIMED_SPELL_CREATURE: