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

Color coded the alignment bonus. Two more reports for the new themes.

Browse source
This commit is contained in:
fendrin 2013-11-24 22:57:53 +01:00
parent ca7a220e9e
commit da4fa1da84
1 changed files with 39 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/reports.cpp
View file

@ -340,7 +340,13 @@ static config unit_alignment(const unit* u)
char const *align = unit_type::alignment_description(u->alignment(), u->gender());
std::string align_id = unit_type::alignment_id(u->alignment());
int cm = combat_modifier(resources::screen->displayed_unit_hex(), u->alignment(), u->is_fearless());
str << align << " (" << utils::signed_percent(cm) << ")";
//str << align << " (" << utils::signed_percent(cm) << ")";
std::string color("grey");
if (cm != 0) color = (cm > 0) ? "green" : "red";
str << "<span foreground=\"" << color << "\">" << utils::signed_percent(cm) << "</span>\n";
tooltip << _("Alignment: ") << "<b>" << align << "</b>\n"
<< string_table[align_id + "_description"];
return text_report(str.str(), tooltip.str(), "time_of_day");
@ -1049,6 +1055,27 @@ REPORT_GENERATOR(unit_profile)
return image_report(u->small_profile());
}
REPORT_GENERATOR(tod_stats)
{
std::ostringstream tooltip;
std::ostringstream text;
int current = resources::tod_manager->get_current_time();
int i = 0;
BOOST_FOREACH(const time_of_day& tod, resources::tod_manager->times()) {
if (i == current) tooltip << "<b>";
tooltip << tod.name << "\n";
if (i == current) tooltip << "</b>";
i++;
}
int times = resources::tod_manager->times().size();
text << current + 1 << "/" << times;
return text_report(text.str(), tooltip.str());
}
static config time_of_day_at(const map_location& mouseover_hex)
{
std::ostringstream tooltip;
@ -1367,6 +1394,17 @@ REPORT_GENERATOR(terrain)
return text_report(str.str());
}
REPORT_GENERATOR(zoom_level)
{
std::ostringstream text;
std::ostringstream tooltip;
std::ostringstream help;
text << static_cast<int>(display::get_singleton()->get_zoom_factor() * 100) << "%";
return text_report(text.str(), tooltip.str(), help.str());
}
REPORT_GENERATOR(position)
{
const gamemap &map = *resources::game_map;