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

tweak the help page list of traits display, for undead units

Browse source 
If a unit *only* has musthave traits, then we don't count them
and omit the number, just listing 'Traits: ... , ...'. This really
only changes how undead units' traits are displayed. This looks
much better without sacrificing clarity in these cases.
This commit is contained in:
Chris Beck 2014-07-16 05:36:09 -04:00
parent 65da898a4c
commit fc1c41c00b
1 changed files with 17 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/help.cpp
View file

@ -1545,33 +1545,27 @@ public:
((trait["availability"].str() == "musthave") ? must_have_traits : random_traits).push_back(std::make_pair(lang_trait_name, ref_id));
}
size_t numlines = 0;
std::stringstream ss1; //Line 1
std::stringstream ss2; //Line 2
bool line1 = !must_have_traits.empty();
bool line2 = !random_traits.empty() && type_.num_traits() - must_have_traits.size() > 0;
if (!must_have_traits.empty()) {
ss1 << " (" << must_have_traits.size() << ") : ";
print_trait_list(ss1, must_have_traits);
numlines++;
}
if (!random_traits.empty() && type_.num_traits() - must_have_traits.size() > 0) {
ss2 << " (" << type_.num_traits() - must_have_traits.size() << ") : ";
print_trait_list(ss2, random_traits);
numlines++;
}
if (numlines >= 1) {
if (line1) {
ss << _("Traits");
if (numlines >= 2) {
ss << ":\n";
ss << jump(30) << ss1.str() << "\n";
ss << jump(30) << ss2.str() << "\n";
if (line2) {
ss << ":\n" << jump(30) << " (" << must_have_traits.size() << ") : ";
print_trait_list(ss, must_have_traits);
ss << "\n" << jump(30) << " (" << type_.num_traits() - must_have_traits.size() << ") : ";
print_trait_list(ss, random_traits);
} else {
ss << ss1.str() << ss2.str() << "\n";
ss << ": ";
print_trait_list(ss, must_have_traits);
}
ss << "\n\n";
} else {
if (line2) {
ss << _("Traits") << " (" << type_.num_traits() << ") : ";
print_trait_list(ss, random_traits);
ss << "\n\n";
}
ss << "\n";
}
}