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

tunit_attack: populate attacks list with attack stats

Browse source
This commit is contained in:
Charles Dang 2016-01-09 22:51:47 +11:00
parent e7fb4521af
commit 698a5b1d74
2 changed files with 92 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
data/gui/default/window/unit_attack.cfg
View file

@ -125,9 +125,24 @@
[row]
[column]
grow_factor = 1
horizontal_alignment = "left"
border = "all"
border_size = 5
[image]
id = "attacker_weapon_icon"
definition = "default"
[/image]
[/column]
[column]
grow_factor = 1
horizontal_grow = "true"
vertical_alignment = "top"
border = "all"
border_size = 5
@ -140,9 +155,25 @@
[/column]
[column]
grow_factor = 1
horizontal_alignment = "center"
vertical_alignment = "center"
border = "all"
border_size = 5
[label]
id = "range"
linked_group = "weapon"
[/label]
[/column]
[column]
grow_factor = 1
horizontal_grow = "true"
vertical_alignment = "top"
border = "all"
border_size = 5
@ -152,11 +183,24 @@
definition = "alignment"
linked_group = "weapon"
text_alignment = "right"
text_alignment = "left"
[/label]
[/column]
[column]
grow_factor = 1
horizontal_alignment = right
border = "all"
border_size = 5
[image]
id = "defender_weapon_icon"
definition = "default"
[/image]
[/column]
[/row]
[/grid]

53
src/gui/dialogs/unit_attack.cpp
View file

@ -25,6 +25,9 @@
#endif
#include "gui/widgets/settings.hpp"
#include "gui/widgets/window.hpp"
#include "game_config.hpp"
#include "language.hpp"
#include "marked-up_text.hpp"
#include "unit.hpp"
#include "utils/foreach.tpp"
@ -110,22 +113,60 @@ static void set_weapon_info(twindow& window,
FOREACH(const AUTO & weapon, weapons)
{
const battle_context_unit_stats& attacker = weapon.get_attacker_stats();
const battle_context_unit_stats& defender = weapon.get_defender_stats();
const attack_type& attacker_weapon = *attacker.weapon;
const attack_type& defender_weapon = defender.weapon ? *defender.weapon
: no_weapon;
const attack_type& attacker_weapon =
*attacker.weapon;
const attack_type& defender_weapon = defender.weapon ?
*defender.weapon : no_weapon;
const SDL_Color a_cth_color =
int_to_color(game_config::red_to_green(attacker.chance_to_hit));
const SDL_Color d_cth_color =
int_to_color(game_config::red_to_green(defender.chance_to_hit));
const std::string& attw_name = !attacker_weapon.name().empty() ? attacker_weapon.name() : " ";
const std::string& defw_name = !defender_weapon.name().empty() ? defender_weapon.name() : " ";
std::string range = attacker_weapon.range().empty() ? defender_weapon.range() : attacker_weapon.range();
if (!range.empty()) {
range = string_table["range_" + range];
}
std::stringstream attacker_stats, defender_stats;
attacker_stats << "<b>" << attw_name << "</b>" << "\n"
<< attacker_weapon.damage() << font::weapon_numbers_sep << attacker_weapon.num_attacks()
<< " " << attacker_weapon.weapon_specials() << "\n"
<< font::span_color(a_cth_color) << attacker.chance_to_hit << "%</span>" << "\n";
defender_stats << "<b>" << defw_name << "</b>" << "\n"
<< defender_weapon.damage() << font::weapon_numbers_sep << defender_weapon.num_attacks()
<< " " << defender_weapon.weapon_specials() << "\n"
<< font::span_color(d_cth_color) << defender.chance_to_hit << "%</span>" << "\n";
std::map<std::string, string_map> data;
string_map item;
item["label"] = attacker_weapon.name();
item["label"] = attacker_weapon.icon();
data.insert(std::make_pair("attacker_weapon_icon", item));
item["label"] = attacker_stats.str();
item["use_markup"] = "true";
data.insert(std::make_pair("attacker_weapon", item));
item["label"] = defender_weapon.name();
//item["label"] = << utils::unicode_em_dash + " " << range << " " + utils::unicode_em_dash;
item["label"] = "<span color='#a69275'>" + utils::unicode_em_dash + " " + range + " " + utils::unicode_em_dash + "</span>";
item["use_markup"] = "true";
data.insert(std::make_pair("range", item));
item["label"] = defender_stats.str();
item["use_markup"] = "true";
data.insert(std::make_pair("defender_weapon", item));
item["label"] = defender_weapon.icon();
data.insert(std::make_pair("defender_weapon_icon", item));
weapon_list.add_row(data);
}