Author: elias
Date: Fri Oct  3 17:14:56 2008
New Revision: 29829

URL: http://svn.gna.org/viewcvs/wesnoth?rev=29829&view=rev
Log:
wmlunits: use description from base units

Modified:
    trunk/data/tools/wmlunits

Modified: trunk/data/tools/wmlunits
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/wmlunits?rev=29829&r1=29828&r2=29829&view=diff
==============================================================================
--- trunk/data/tools/wmlunits (original)
+++ trunk/data/tools/wmlunits Fri Oct  3 17:14:56 2008
@@ -345,10 +345,10 @@
         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 @@
             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)


_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits

Reply via email to