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

Merge branch 'master' of github.com:wesnoth/wesnoth-old

Browse source
This commit is contained in:
Alexander van Gessel 2014-02-02 17:00:54 +01:00
commit ba3c02f2f0
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
data/tools/unit_tree/html_output.py
View file

@ -775,6 +775,8 @@ class HTMLOutput:
hp = uval("hitpoints")
mp = uval("movement")
xp = uval("experience")
vision = uval("vision")
jamming = uval("jamming")
level = uval("level")
alignment = uval("alignment")
@ -821,14 +823,17 @@ class HTMLOutput:
("cost", _("Cost: ", "wesnoth-help")),
("hitpoints", _("HP: ")),
("movement", _("Movement", "wesnoth-help") + ": "),
("vision", _("Vision", "wesnoth-help") + ": "),
("jamming", _("Jamming", "wesnoth-help") + ":"),
("experience", _("XP: ")),
("level", _("Level") + ": "),
("alignment", _("Alignment: ")),
("id", "ID")]:
x = uval(val)
if not x and val in ("jamming", "vision"): continue
if val == "alignment": x = _(x)
write("<tr>\n")
write("<td>%s</td>" % text)
x = uval(val)
if val == "alignment": x = _(x)
write("<td class=\"val\">%s</td>" % x)
write("</tr>\n")

3
data/tools/wmlunits
View file

@ -311,12 +311,11 @@ def list_contents():
sys.stdout.write("up to date\n")
continue
info["parsed"] = False
info["dependencies"] = get_dependencies(addon)
parse("{core}{multiplayer}{~add-ons}", "MULTIPLAYER,SKIP_CORE")
info["eras"] = list_eras(batchlist, addon)
info["campaigns"] = list_campaigns(batchlist, addon)
info["version"] = version
info["dependencies"] = get_dependencies(addon)
sys.stdout.write("ok\n")
except wmlparser2.WMLError as e:
ef = open(logname, "w")