summaryrefslogtreecommitdiff
path: root/hercules/code/server/evol
diff options
context:
space:
mode:
Diffstat (limited to 'hercules/code/server/evol')
-rw-r--r--hercules/code/server/evol/athena.py8
-rw-r--r--hercules/code/server/evol/consts.py4
-rw-r--r--hercules/code/server/evol/itemdb.py2
-rw-r--r--hercules/code/server/evol/main.py2
-rw-r--r--hercules/code/server/evol/npcs.py24
5 files changed, 20 insertions, 20 deletions
diff --git a/hercules/code/server/evol/athena.py b/hercules/code/server/evol/athena.py
index bad35da..9f403da 100644
--- a/hercules/code/server/evol/athena.py
+++ b/hercules/code/server/evol/athena.py
@@ -30,7 +30,7 @@ def parseInventory(line, data):
rows2 = comaSplit.split(data2)
if len(rows2) != 12:
- print "wrong inventory in account.txt line: " + stripNewLine(line)
+ print("wrong inventory in account.txt line: " + stripNewLine(line))
continue
item = Item()
@@ -69,7 +69,7 @@ def parseSkills(line, data):
rows2 = comaSplit.split(data2)
if len(rows2) != 2:
- print "wrong skills in account.txt line: " + stripNewLine(line)
+ print("wrong skills in account.txt line: " + stripNewLine(line))
continue
skill = Skill()
@@ -98,7 +98,7 @@ def parseVars(line, data):
rows2 = comaSplit.split(data2)
if len(rows2) != 2:
- print "wrong variables in account.txt line: " + stripNewLine(line)
+ print("wrong variables in account.txt line: " + stripNewLine(line))
continue
variables[rows2[0]] = rows2[1]
@@ -118,7 +118,7 @@ def readAthena():
if len(rows) == 2:
continue
if len(rows) != 20:
- print "wrong account.txt line: " + stripNewLine(line)
+ print("wrong account.txt line: " + stripNewLine(line))
continue
user = User()
diff --git a/hercules/code/server/evol/consts.py b/hercules/code/server/evol/consts.py
index c63f559..a1cdf18 100644
--- a/hercules/code/server/evol/consts.py
+++ b/hercules/code/server/evol/consts.py
@@ -27,7 +27,7 @@ def convertConsts(quests):
else:
w.write("{0}\t{1}\t{2}".format(rows[0], rows[1], rows[2]))
# build in parameters
- w.write("ClientVersion\t10000\t1\n");
+ w.write("ClientVersion\t10000\t1\n")
srcFile = "oldserverdata/db/const.txt"
w.write("// evol constants\n")
@@ -44,6 +44,6 @@ def convertConsts(quests):
rows[1] = str(quests[rows[0]]) + "\n"
if rows[0] in fields:
if fields[rows[0]] != rows[1][:-1]:
- print "warning: different const values for {0} ({1}, {2})".format(rows[0], rows[1][:-1], fields[rows[0]])
+ print("warning: different const values for {0} ({1}, {2})".format(rows[0], rows[1][:-1], fields[rows[0]]))
else:
w.write("{0}\t{1}".format(rows[0], rows[1]))
diff --git a/hercules/code/server/evol/itemdb.py b/hercules/code/server/evol/itemdb.py
index a60e57d..a7a54b0 100644
--- a/hercules/code/server/evol/itemdb.py
+++ b/hercules/code/server/evol/itemdb.py
@@ -18,7 +18,7 @@ def convertItemDb():
with open(srcFile, "r") as r:
with open(dstFile, "w") as w:
with open(constsFile, "a") as c:
- c.write("// items\n");
+ c.write("// items\n")
tpl = readFile("templates/item_db.tpl")
w.write(tpl)
for line in r:
diff --git a/hercules/code/server/evol/main.py b/hercules/code/server/evol/main.py
index be9f0ab..6072a80 100644
--- a/hercules/code/server/evol/main.py
+++ b/hercules/code/server/evol/main.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#!/usr/bin/env python3
# -*- coding: utf8 -*-
#
# Copyright (C) 2014 Evol Online
diff --git a/hercules/code/server/evol/npcs.py b/hercules/code/server/evol/npcs.py
index 6efe811..dd2c7be 100644
--- a/hercules/code/server/evol/npcs.py
+++ b/hercules/code/server/evol/npcs.py
@@ -31,7 +31,7 @@ monsterRe = re.compile("^(?P<map>[^/](.+))[.]gat,([ ]*)(?P<x>[\d]+),([ ]*)(?P<y>
"(?P<tag>monster)[\t](?P<name>[\w#' ]+)[\t]"
"(?P<class>[\d]+),(?P<num>[\d]+),(?P<look>[\d-]+),(?P<delay1>[\d]+),(?P<delay2>[\d]+)$")
-setRe = re.compile("^(?P<space>[ ]+)set[ ](?P<var>[^,]+),([ ]*)(?P<val>[^;]+);$");
+setRe = re.compile("^(?P<space>[ ]+)set[ ](?P<var>[^,]+),([ ]*)(?P<val>[^;]+);$")
class ScriptTracker:
pass
@@ -115,7 +115,7 @@ def processScriptMapLine(line):
def writeScript(w, m):
if m.group("gender") != None:
- w.write("// Gender = {0}\n".format(m.group("gender")));
+ w.write("// Gender = {0}\n".format(m.group("gender")))
if m.group("x") == 0 and m.group("y") == 0: # float npc
w.write("-")
@@ -128,7 +128,7 @@ def writeScript(w, m):
class_ = int(class_)
if class_ > 125 and class_ <= 400:
class_ = class_ + 100
- w.write("\t{0}\t{1}\t{2}".format(m.group("tag"), m.group("name"), class_));
+ w.write("\t{0}\t{1}\t{2}".format(m.group("tag"), m.group("name"), class_))
def processScript(tracker):
line = tracker.line
@@ -139,7 +139,7 @@ def processScript(tracker):
m = scriptRe.search(line)
if m == None:
- print "error in parsing: " + line
+ print("error in parsing: " + line)
w.write("!!!error parsing line")
w.write(line)
return
@@ -149,11 +149,11 @@ def processScript(tracker):
# m.group("tag"), m.group("name"), m.group("class"), m.group("xs"), m.group("ys"), m.group("size"))
if m.group("size") != None:
- w.write("// Size = {0}\n".format(m.group("size")));
+ w.write("// Size = {0}\n".format(m.group("size")))
writeScript(w, m)
if m.group("xs") != None:
- w.write(",{0},{1}".format(m.group("xs"), m.group("ys")));
- w.write(",{\n");
+ w.write(",{0},{1}".format(m.group("xs"), m.group("ys")))
+ w.write(",{\n")
def itemsToShop(tracker, itemsStr):
@@ -175,7 +175,7 @@ def processShop(tracker):
m = shopRe.search(line)
if m == None:
- print "error in parsing: " + line
+ print("error in parsing: " + line)
w.write("!!!error parsing line")
w.write(line)
return
@@ -193,7 +193,7 @@ def processMapFlag(tracker):
m = mapFlagRe.search(line)
if m == None:
- print "error in parsing: " + line
+ print("error in parsing: " + line)
w.write("!!!error parsing line")
w.write(line)
return
@@ -212,7 +212,7 @@ def processWarp(tracker):
w = tracker.w
m = warpRe.search(line)
if m == None:
- print "error in parsing: " + line
+ print("error in parsing: " + line)
w.write("!!!error parsing line")
w.write(line)
return
@@ -237,7 +237,7 @@ def processMonster(tracker):
w = tracker.w
m = monsterRe.search(line)
if m == None:
- print "error in parsing: " + line
+ print("error in parsing: " + line)
w.write("!!!error parsing line")
w.write(line)
return
@@ -273,7 +273,7 @@ def processStrReplace(tracker):
line = line.replace("getmapmobs(", "mobcount(")
- m = setRe.search(line);
+ m = setRe.search(line)
if m != None:
line = "{0}{1} = {2};\n".format(m.group("space"), m.group("var"), m.group("val"))
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-06-01 20:18:57 +0000