diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-10-14 22:18:04 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-10-14 22:18:04 +0300 |
| commit | 5fd2ab54805f627b48e7b0a53935f5442a1ea6d9 (patch) | |
| tree | fa1c29ea05d5fbdaee878e7e44b6a2616b319a21 | |
| parent | eec80633694f983ccba12c5a3986c6e29e850b2c (diff) | |
| download | evol-tools-s20161024.tar.gz evol-tools-s20161024.tar.bz2 evol-tools-s20161024.tar.xz evol-tools-s20161024.zip | |
| -rw-r--r-- | hercules/code/server/evol/athena.py | 4 | ||||
| -rw-r--r-- | hercules/code/server/evol/main.py | 2 | ||||
| -rw-r--r-- | hercules/code/server/tmw/athena.py | 4 | ||||
| -rw-r--r-- | hercules/code/server/tmw/main.py | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/hercules/code/server/evol/athena.py b/hercules/code/server/evol/athena.py index 59d8223..bad35da 100644 --- a/hercules/code/server/evol/athena.py +++ b/hercules/code/server/evol/athena.py @@ -7,7 +7,7 @@ import re from code.stringutils import stripNewLine, removeGat from code.server.dbitem import Item -from code.server.dbskill import Skill, skills +from code.server.dbskill import Skill from code.server.dbuser import User comaSplit = re.compile(",") @@ -89,7 +89,7 @@ def parseVars(line, data): rows = spaceSplit.split(data) if len(rows) < 1: - return skills + return variables for data2 in rows: if data2 == "": diff --git a/hercules/code/server/evol/main.py b/hercules/code/server/evol/main.py index 0483118..be9f0ab 100644 --- a/hercules/code/server/evol/main.py +++ b/hercules/code/server/evol/main.py @@ -19,7 +19,7 @@ from code.server.evol.mobdb import convertMobDb from code.server.evol.mobskilldb import convertMobSkillDb from code.server.evol.npcs import createMainScript, convertNpcs from code.server.questsdb import convertQuestsDb -from code.serverutils import cleanServerData +from code.server.utils import cleanServerData def serverEvolMain(): cleanServerData() diff --git a/hercules/code/server/tmw/athena.py b/hercules/code/server/tmw/athena.py index 6ad3e9c..6548b2e 100644 --- a/hercules/code/server/tmw/athena.py +++ b/hercules/code/server/tmw/athena.py @@ -7,7 +7,7 @@ import re from code.stringutils import stripNewLine from code.server.dbitem import Item -from code.server.dbskill import Skill, skills +from code.server.dbskill import Skill from code.server.dbuser import User comaSplit = re.compile(",") @@ -89,7 +89,7 @@ def parseVars(line, data): rows = spaceSplit.split(data) if len(rows) < 1: - return skills + return variables for data2 in rows: if data2 == "": diff --git a/hercules/code/server/tmw/main.py b/hercules/code/server/tmw/main.py index f3dd10d..bfbf5ef 100644 --- a/hercules/code/server/tmw/main.py +++ b/hercules/code/server/tmw/main.py @@ -20,7 +20,7 @@ from code.server.tmw.itemdb import convertItemDb from code.server.tmw.mobdb import convertMobDb from code.server.tmw.mobskilldb import convertMobSkillDb from code.server.tmw.npcs import createMainScript, convertNpcs -from code.serverutils import cleanServerData +from code.server.utils import cleanServerData def serverTmwMain(isNew): try: |