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

Colour-code modifiers in trait description tooltips

Browse source
This commit is contained in:
Celtic Minstrel 2017-05-22 00:28:50 -04:00
parent c6bdcb0f53
commit c8e6316853
2 changed files with 33 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/units/attack_type.cpp
View file

@ -346,10 +346,10 @@ bool attack_type::describe_modification(const config& cfg,std::string* descripti
if(!increase_damage.empty()) {
desc.emplace_back(VNGETTEXT(
// TRANSLATORS: Current value for WML code increase_damage, documented in https://wiki.wesnoth.org/EffectWML
"$number_or_percent damage",
"$number_or_percent damage",
"<span color=\"$color\">$number_or_percent</span> damage",
"<span color=\"$color\">$number_or_percent</span> damage",
std::stoi(increase_damage),
{{"number_or_percent", utils::print_modifier(increase_damage)}}));
{{"number_or_percent", utils::print_modifier(increase_damage)}, {"color", increase_damage[0] == '-' ? "red" : "green"}}));
}
if(!set_damage.empty()) {
@ -364,10 +364,10 @@ bool attack_type::describe_modification(const config& cfg,std::string* descripti
if(!increase_attacks.empty()) {
desc.emplace_back(VNGETTEXT(
// TRANSLATORS: Current value for WML code increase_attacks, documented in https://wiki.wesnoth.org/EffectWML
"$number_or_percent strike",
"$number_or_percent strikes",
"<span color=\"$color\">$number_or_percent</span> strike",
"<span color=\"$color\">$number_or_percent</span> strikes",
std::stoi(increase_attacks),
{{"number_or_percent", utils::print_modifier(increase_attacks)}}));
{{"number_or_percent", utils::print_modifier(increase_attacks)}, {"color", increase_attacks[0] == '-' ? "red" : "green"}}));
}
if(!set_attacks.empty()) {
@ -382,15 +382,15 @@ bool attack_type::describe_modification(const config& cfg,std::string* descripti
if(!set_accuracy.empty()) {
desc.emplace_back(VGETTEXT(
// TRANSLATORS: Current value for WML code set_accuracy, documented in https://wiki.wesnoth.org/EffectWML
"$percent|% accuracy",
{{"percent", set_accuracy}}));
"$number| accuracy",
{{"number", set_accuracy}}));
}
if(!increase_accuracy.empty()) {
desc.emplace_back(VGETTEXT(
// TRANSLATORS: Current value for WML code increase_accuracy, documented in https://wiki.wesnoth.org/EffectWML
"$percent|% accuracy",
{{"percent", utils::print_modifier(increase_accuracy)}}));
"<span color=\"$color\">$number_or_percent|%</span> accuracy",
{{"number_or_percent", utils::print_modifier(increase_accuracy)}, {"color", increase_accuracy[0] == '-' ? "red" : "green"}}));
}
if(!set_parry.empty()) {
@ -403,8 +403,8 @@ bool attack_type::describe_modification(const config& cfg,std::string* descripti
if(!increase_parry.empty()) {
desc.emplace_back(VGETTEXT(
// TRANSLATORS: Current value for WML code increase_parry, documented in https://wiki.wesnoth.org/EffectWML
"$number_or_percent parry",
{{"number_or_percent", utils::print_modifier(increase_parry)}}));
"<span color=\"$color\">$number_or_percent</span> parry",
{{"number_or_percent", utils::print_modifier(increase_parry)}, {"color", increase_parry[0] == '-' ? "red" : "green"}}));
}
if(!set_movement.empty()) {
@ -419,10 +419,10 @@ bool attack_type::describe_modification(const config& cfg,std::string* descripti
if(!increase_movement.empty()) {
desc.emplace_back(VNGETTEXT(
// TRANSLATORS: Current value for WML code increase_movement, documented in https://wiki.wesnoth.org/EffectWML
"$number_or_percent movement point",
"$number_or_percent movement points",
"<span color=\"$color\">$number_or_percent movement</span> point",
"<span color=\"$color\">$number_or_percent movement</span> points",
std::stoi(increase_movement),
{{"number_or_percent", utils::print_modifier(increase_movement)}}));
{{"number_or_percent", utils::print_modifier(increase_movement)}, {"color", increase_movement[0] == '-' ? "red" : "green"}}));
}
*description = utils::format_conjunct_list("", desc);

34
src/units/unit.cpp
View file

@ -1772,8 +1772,8 @@ std::string unit::describe_builtin_effect(std::string apply_to, const config& ef
if(!increase_total.empty()) {
return vgettext(
"wesnoth",
"$number_or_percent HP",
utils::string_map({{"number_or_percent", utils::print_modifier(increase_total)}}));
"<span color=\"$color\">$number_or_percent</span> HP",
{{"number_or_percent", utils::print_modifier(increase_total)}, {"color", increase_total[0] == '-' ? "red" : "green"}});
}
} else {
const std::string& increase = effect["increase"];
@ -1782,32 +1782,34 @@ std::string unit::describe_builtin_effect(std::string apply_to, const config& ef
}
if(apply_to == "movement") {
return VNGETTEXT(
"$number_or_percent move",
"$number_or_percent moves",
"<span color=\"$color\">$number_or_percent</span> move",
"<span color=\"$color\">$number_or_percent</span> moves",
std::stoi(increase),
utils::string_map({{"number_or_percent", utils::print_modifier(increase)}}));
{{"number_or_percent", utils::print_modifier(increase)}, {"color", increase[0] == '-' ? "red" : "green"}});
} else if(apply_to == "vision") {
return vgettext(
"$number_or_percent vision",
utils::string_map({{"number_or_percent", utils::print_modifier(increase)}}));
"<span color=\"$color\">$number_or_percent</span> vision",
{{"number_or_percent", utils::print_modifier(increase)}, {"color", increase[0] == '-' ? "red" : "green"}});
} else if(apply_to == "jamming") {
return vgettext(
"$number_or_percent jamming",
utils::string_map({{"number_or_percent", utils::print_modifier(increase)}}));
"<span color=\"$color\">$number_or_percent</span> jamming",
{{"number_or_percent", utils::print_modifier(increase)}, {"color", increase[0] == '-' ? "red" : "green"}});
} else if(apply_to == "max_experience") {
// Unlike others, decreasing experience is a *GOOD* thing
return vgettext(
"$number_or_percent XP to advance",
utils::string_map({{"number_or_percent", utils::print_modifier(increase)}}));
"<span color=\"$color\">$number_or_percent</span> XP to advance",
{{"number_or_percent</span>", utils::print_modifier(increase)}, {"color", increase[0] == '-' ? "green" : "red"}});
} else if(apply_to == "max_attacks") {
return VNGETTEXT(
"$number_or_percent attack per turn",
"$number_or_percent attacks per turn",
"<span color=\"$color\">$number_or_percent</span> attack per turn",
"<span color=\"$color\">$number_or_percent</span> attacks per turn",
std::stoi(increase),
utils::string_map({{"number_or_percent", utils::print_modifier(increase)}}));
{{"number_or_percent", utils::print_modifier(increase)}, {"color", increase[0] == '-' ? "red" : "green"}});
} else if(apply_to == "recall_cost") {
// Unlike others, decreasing recall cost is a *GOOD* thing
return vgettext(
"$number_or_percent cost to recall",
utils::string_map({{"number_or_percent", utils::print_modifier(increase)}}));
"<span color=\"$color\">$number_or_percent</span> cost to recall",
{{"number_or_percent", utils::print_modifier(increase)}, {"color", increase[0] == '-' ? "green" : "red"}});
}
}
return "";