0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Attack Predictions: consistent formatting for ability modifiers

Browse source
This commit is contained in:
Charles Dang 2017-03-23 08:23:11 +11:00
parent 8bbe4189ed
commit 004fa50710
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gui/dialogs/attack_predictions.cpp
View file

@ -143,20 +143,20 @@ void attack_predictions::set_data(window& window, const combatant_data& attacker
ss << weapon->damage() << " (<i>" << weapon->name() << "</i>)";
} else {
assert(set_dmg_effect->ability);
ss << set_dmg_effect->value << " (" << (*set_dmg_effect->ability)["name"] << ")";
ss << set_dmg_effect->value << " (<i>" << (*set_dmg_effect->ability)["name"] << "</i>)";
}
// Process the ADD damage modifiers.
for(const auto& e : dmg_effect) {
if(e.type == unit_abilities::ADD) {
ss << "\n";
ss << (*e.ability)["name"] << ": ";
if(e.value >= 0) {
ss << '+';
}
ss << e.value;
ss << " (<i>" << (*e.ability)["name"] << "</i>)";
}
}
@ -164,7 +164,7 @@ void attack_predictions::set_data(window& window, const combatant_data& attacker
for(const auto& e : dmg_effect) {
if(e.type == unit_abilities::MUL) {
ss << "\n";
ss << (*e.ability)["name"] << ": " << font::unicode_multiplication_sign << (e.value / 100);
ss << font::unicode_multiplication_sign << (e.value / 100);
if(e.value % 100) {
ss << "." << ((e.value % 100) / 10);
@ -172,6 +172,8 @@ void attack_predictions::set_data(window& window, const combatant_data& attacker
ss << (e.value % 10);
}
}
ss << " (<i>" << (*e.ability)["name"] << "</i>)";
}
}