From e3ed84959f0c38085a2acb58dd1ea678a4c8e5ad Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 22 May 2016 20:19:45 +0300
Subject: hercules: add mercenaries name into converted xml.

---
 hercules/code/servertoclient/mercenaries.py | 6 ++++--
 hercules/templates/mercenary.tpl            | 4 ++--
 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>
-- 
cgit v1.2.3-70-g09d2