Author: elias
Date: Tue Apr 29 18:38:45 2008
New Revision: 26230
URL: http://svn.gna.org/viewcvs/wesnoth?rev=26230&view=rev
Log:
wmlunits: increased font size of unit level indicator, added faction-leader
indicator, added info link, added abilities, added id
Modified:
trunk/data/tools/unit_tree/helpers.py
trunk/data/tools/unit_tree/style.css
trunk/data/tools/wmlunits
Modified: trunk/data/tools/unit_tree/helpers.py
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/unit_tree/helpers.py?rev=26230&r1=26229&r2=26230&view=diff
==============================================================================
--- trunk/data/tools/unit_tree/helpers.py (original)
+++ trunk/data/tools/unit_tree/helpers.py Tue Apr 29 18:38:45 2008
@@ -169,12 +169,19 @@
era.faction_lookup[fid] = multiplayer_side
recruit = multiplayer_side.get_text_val("recruit").strip()
leader = multiplayer_side.get_text_val("leader").strip()
- units = recruit.split(",") + leader.split(",")
+ units = recruit.split(",")
+ leaders = leader.split(",")
multiplayer_side.units = {}
+ multiplayer_side.is_leader = {}
for u in units:
uid = u.strip()
if uid:
multiplayer_side.units[uid] = True
+ for u in leaders:
+ uid = u.strip()
+ if uid:
+ multiplayer_side.units[uid] = True
+ multiplayer_side.is_leader[uid] = True
return eid
def add_campaign(self, campaign):
Modified: trunk/data/tools/unit_tree/style.css
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/unit_tree/style.css?rev=26230&r1=26229&r2=26230&view=diff
==============================================================================
--- trunk/data/tools/unit_tree/style.css (original)
+++ trunk/data/tools/unit_tree/style.css Tue Apr 29 18:38:45 2008
@@ -137,11 +137,23 @@
div.l {
color: gray;
font-weight: normal;
- font-size: xx-small;
+ font-size: small;
border: 1px solid;
float: right;
margin: 0px;
}
+div.i {
+ padding: 4px;
+ font-weight: normal;
+ font-size: small;
+ border: 1px solid white;
+ float: left;
+ margin: 0px;
+ }
+div.i a {
+ color: #8080ff;
+ text-decoration: underline;
+}
div.attributes {
font-size: small;
font-weight: normal;
Modified: trunk/data/tools/wmlunits
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/wmlunits?rev=26230&r1=26229&r2=26230&view=diff
==============================================================================
--- trunk/data/tools/wmlunits (original)
+++ trunk/data/tools/wmlunits Tue Apr 29 18:38:45 2008
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+#encoding: utf8
"""
wmlunits -- tool to output information on all units in HTML
@@ -324,6 +325,7 @@
for i in range(6):
write("<col class=\"col%d\" />" % i)
write("</colgroup>")
+ ms = None
for row in range(len(rows)):
write("<tr>\n")
for column in range(6):
@@ -338,6 +340,15 @@
attributes += " colspan=%d" % hspan
if un and isinstance(un, helpers.GroupNode):
+ # Find the current multiplayer side so we can show the
+ # little crowns..
+ ms = None
+ try:
+ eid, fid = un.data
+ era = self.wesnoth.era_lookup[eid]
+ ms = era.faction_lookup[fid]
+ except TypeError:
+ pass
racename = un.name
attributes += " class=\"raceheader\""
write("<td%s>" % attributes)
@@ -356,8 +367,17 @@
xp = self.wesnoth.get_unit_value(u, "experience")
level = self.wesnoth.get_unit_value(u, "level")
- write("<div class=\"l\">L%s</div>" % level)
+ crown = ""
+ if ms:
+ if un.id in ms.units:
+ crown = u" â"
+ if un.id in ms.is_leader:
+ crown = u" â"
+
link = "../%s/%s.html" % (self.isocode, uid)
+ write("<div class=\"i\"><a href=\"%s\"
title=\"%s\">%s</a></div>" % (
+ link, uid, u"â¹"))
+ write("<div class=\"l\">L%s%s</div>" % (level, crown))
write("<a href=\"%s\">%s</a><br/>" % (link, name))
write('<div class="pic">')
@@ -374,9 +394,22 @@
self.get_translation("wesnoth", "MP: "), mp))
write("%s%s<br />" % (
self.get_translation("wesnoth", "XP: "), xp))
-
+
+ # Write info about abilities.
+ anames = []
+ for abilities in u.get_all("abilities"):
+ for ability in abilities.children():
+ name = ability.get_text_val("name")
+ if not name: name = ability.get_text_val("id")
+ if not name: name = ability.name
+ anames.append(name)
+ if anames:
+ write("\n<div style=\"clear:both\">")
+ write(", ".join(anames))
+ write("</div>")
+
+ # Write info about attacks.
write("\n<div style=\"clear:both\">")
- # Write info about attacks.
for attack in u.get_all("attack"):
t = attack.get_text_val("type")
write("%s " % self.get_translation("wesnoth", t))
@@ -522,6 +555,21 @@
if val == "alignment": x = self.get_translation("wesnoth", x)
write("<td>%s</td>" % x)
write("</tr>\n")
+
+ # Write info about abilities.
+ anames = []
+ for abilities in unit.get_all("abilities"):
+ for ability in abilities.children():
+ name = ability.get_text_val("name")
+ if not name: name = ability.get_text_val("id")
+ if not name: name = ability.name
+ anames.append(name)
+
+ write("<tr>\n")
+ write("<th>%s</th>" % _("Abilities: "))
+ write("<td>" + (", ".join(anames)) + "</td>")
+ write("</tr>\n")
+
write("</table>\n")
# Write info about attacks.
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
