summaryrefslogtreecommitdiff
path: root/hercules
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-22 20:19:45 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-22 20:19:45 +0300
commite3ed84959f0c38085a2acb58dd1ea678a4c8e5ad (patch)
treebb4672f765abc2b2672aa7d6411b22535e75c063 /hercules
parent7dfa42da500427b4d6cf034af21ebdeeb1d9b029 (diff)
downloadevol-tools-e3ed84959f0c38085a2acb58dd1ea678a4c8e5ad.tar.gz
evol-tools-e3ed84959f0c38085a2acb58dd1ea678a4c8e5ad.tar.bz2
evol-tools-e3ed84959f0c38085a2acb58dd1ea678a4c8e5ad.tar.xz
evol-tools-e3ed84959f0c38085a2acb58dd1ea678a4c8e5ad.zip
hercules: add mercenaries name into converted xml.
Diffstat (limited to 'hercules')
-rw-r--r--hercules/code/servertoclient/mercenaries.py6
-rw-r--r--hercules/templates/mercenary.tpl4
2 files changed, 6 insertions, 4 deletions
diff --git a/hercules/code/servertoclient/mercenaries.py b/hercules/code/servertoclient/mercenaries.py
index 2b8c5f3..9e4245d 100644
--- a/hercules/code/servertoclient/mercenaries.py
+++ b/hercules/code/servertoclient/mercenaries.py
@@ -24,6 +24,8 @@ def convertMercenaries():
rows = fieldsSplit.split(line)
if len(rows) < 9:
continue
- mercenaryId = rows[0]
- data = data + tpl.format(mercenaryId, mercenarySprite)
+ data = data + tpl.format(
+ id = rows[0],
+ sprite = mercenarySprite,
+ name = rows[2])
saveFile(destDir + "mercenaries.xml", mercenaries.format(data))
diff --git a/hercules/templates/mercenary.tpl b/hercules/templates/mercenary.tpl
index e17f281..c371659 100644
--- a/hercules/templates/mercenary.tpl
+++ b/hercules/templates/mercenary.tpl
@@ -1,3 +1,3 @@
- <mercenary id="{0}">
- {1}
+ <mercenary id="{id}" name="{name}">
+ {sprite}
</mercenary>