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

wmlunits: use description from base units

Browse source
This commit is contained in:
Elias Pschernig 2008-10-03 15:14:56 +00:00
parent 84dd1bda6c
commit 8e8855d065
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
data/tools/wmlunits
View file

@ -345,10 +345,10 @@ class HTMLOutput:
if base_unit:
attacks = self.get_recursive_attacks(base_unit)
base_attacks = attacks[:]
base_attacks_count = len(attacks)
for i, attack in enumerate(this_unit.get_all("attack")):
# Attack merging is order based.
if i < len(base_attacks):
if i < base_attacks_count:
copy_attributes(attack, attacks[i])
else:
attacks.append(attack)
@ -546,7 +546,9 @@ class HTMLOutput:
write('<img src="%s" alt="(image)" />\n' % image)
write('</div>\n')
description = unit.get_text_val("description")
description = self.wesnoth.get_unit_value(unit, "description")
# TODO: what is unit_description?
if not description: description = unit.get_text_val("unit_description")
if not description: description = "-"
write("<p>%s</p>\n" % description)