summaryrefslogtreecommitdiff
path: root/hercules/code/server/evol/npcs.py
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-02-02 14:45:44 +0300
committerAndrei Karas <akaras@inbox.ru>2016-02-02 14:46:17 +0300
commita5b83b03d6fc567c51abded0736659b7513d91e7 (patch)
tree25dbe428b8cd7af77e377a8dc83ab45d0d7b34d8 /hercules/code/server/evol/npcs.py
parente9cfeeda13aea1bf945bb66e4582fe6a9336fb60 (diff)
downloadtools-a5b83b03d6fc567c51abded0736659b7513d91e7.tar.gz
tools-a5b83b03d6fc567c51abded0736659b7513d91e7.tar.bz2
tools-a5b83b03d6fc567c51abded0736659b7513d91e7.tar.xz
tools-a5b83b03d6fc567c51abded0736659b7513d91e7.zip
hercules: Fix parsing npc scripts from old tmw server.
Diffstat (limited to 'hercules/code/server/evol/npcs.py')
-rw-r--r--hercules/code/server/evol/npcs.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/hercules/code/server/evol/npcs.py b/hercules/code/server/evol/npcs.py
index 2082b23..2d198c1 100644
--- a/hercules/code/server/evol/npcs.py
+++ b/hercules/code/server/evol/npcs.py
@@ -66,7 +66,7 @@ def processNpcFile(srcFile, dstFile, items):
with open(dstFile, "w") as w:
tracker.w = w
for line in r:
- tracker.line = line
+ tracker.line = stripWindows(line)
res = convertTextLine(tracker)
if res:
w.write(tracker.line)
@@ -258,7 +258,6 @@ def processStrReplace(tracker):
w = tracker.w
line = line.replace("setskill ", "addtoskill ")
line = line.replace("zeny", "Zeny")
- line = line.replace("countitem(", "countitemcolor(")
line = line.replace("getclientversion(\"\")", "ClientVersion")
line = line.replace("getclientversion()", "ClientVersion")
line = line.replace("setlang @", "Lang = @")