7 files changed, 26 insertions, 35 deletions
diff --git a/hercules/code/server/evol/athena.py b/hercules/code/server/evol/athena.py
index 567db3b..59d8223 100644
--- a/hercules/code/server/evol/athena.py
+++ b/hercules/code/server/evol/athena.py
@@ -5,11 +5,10 @@
 
 import re
 
-from code.fileutils import *
-from code.stringutils import *
-from code.server.dbitem import *
-from code.server.dbskill import *
-from code.server.dbuser import *
+from code.stringutils import stripNewLine, removeGat
+from code.server.dbitem import Item
+from code.server.dbskill import Skill, skills
+from code.server.dbuser import User
 
 comaSplit = re.compile(",")
 spaceSplit = re.compile(" ")
diff --git a/hercules/code/server/evol/consts.py b/hercules/code/server/evol/consts.py
index d2c5c9b..c63f559 100644
--- a/hercules/code/server/evol/consts.py
+++ b/hercules/code/server/evol/consts.py
@@ -5,9 +5,6 @@
 
 import re
 
-from code.fileutils import *
-from code.stringutils import *
-
 def convertConsts(quests):
     dstFile = "newserverdata/db/const.txt"
     fieldsSplit = re.compile("\t+")
diff --git a/hercules/code/server/evol/itemdb.py b/hercules/code/server/evol/itemdb.py
index b86b848..a60e57d 100644
--- a/hercules/code/server/evol/itemdb.py
+++ b/hercules/code/server/evol/itemdb.py
@@ -5,9 +5,8 @@
 
 import re
 
-from code.configutils import *
-from code.fileutils import *
-from code.stringutils import *
+from code.configutils import writeIntField, writeStartBlock, writeEndBlock, writeStartScript, writeEndScript, writeStrField, writeSubField
+from code.fileutils import readFile
 
 def convertItemDb():
     srcFile = "oldserverdata/db/item_db.txt"
diff --git a/hercules/code/server/evol/main.py b/hercules/code/server/evol/main.py
index 308bc87..0483118 100644
--- a/hercules/code/server/evol/main.py
+++ b/hercules/code/server/evol/main.py
@@ -4,23 +4,22 @@
 # Copyright (C) 2014  Evol Online
 # Author: Andrei Karas (4144)
 
-from code.server.account import *
-from code.server.accreg import *
-from code.server.party import *
-from code.server.storage import *
-from code.server.db.char import *
-from code.server.db.charregnumdb import *
-from code.server.db.inventory import *
-from code.server.db.skill import *
-from code.server.evol.athena import *
-from code.server.evol.consts import *
-from code.server.evol.itemdb import *
-from code.server.evol.mobdb import *
-from code.server.evol.mobskilldb import *
-from code.server.evol.npcs import *
-from code.server.utils import *
-from code.server.questsdb import *
-from code.serverutils import *
+from code.server.account import convertAccount
+from code.server.accreg import convertAccReg
+from code.server.party import convertParty
+from code.server.storage import convertStorage
+from code.server.db.char import saveCharTable
+from code.server.db.charregnumdb import saveCharRegNumDbTable
+from code.server.db.inventory import saveInventoryTable
+from code.server.db.skill import saveSkillTable
+from code.server.evol.athena import readAthena
+from code.server.evol.consts import convertConsts
+from code.server.evol.itemdb import convertItemDb
+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
 
 def serverEvolMain():
     cleanServerData()
diff --git a/hercules/code/server/evol/mobdb.py b/hercules/code/server/evol/mobdb.py
index a09348b..74eda04 100644
--- a/hercules/code/server/evol/mobdb.py
+++ b/hercules/code/server/evol/mobdb.py
@@ -5,9 +5,6 @@
 
 import re
 
-from code.fileutils import *
-from code.stringutils import *
-
 def convertMobDb():
     srcFile = "oldserverdata/db/mob_db.txt"
     dstFile = "newserverdata/db/re/mob_db.txt"
diff --git a/hercules/code/server/evol/mobskilldb.py b/hercules/code/server/evol/mobskilldb.py
index 6f0bf12..a5a7d5f 100644
--- a/hercules/code/server/evol/mobskilldb.py
+++ b/hercules/code/server/evol/mobskilldb.py
@@ -5,8 +5,7 @@
 
 import re
 
-from code.fileutils import *
-from code.stringutils import *
+from code.fileutils import readFile
 
 def convertMobSkillDb():
     srcFile = "oldserverdata/db/mob_skill_db.txt"
diff --git a/hercules/code/server/evol/npcs.py b/hercules/code/server/evol/npcs.py
index 2d198c1..6efe811 100644
--- a/hercules/code/server/evol/npcs.py
+++ b/hercules/code/server/evol/npcs.py
@@ -3,10 +3,11 @@
 # Copyright (C) 2014  Evol Online
 # Author: Andrei Karas (4144)
 
+import os
 import re
 
-from code.fileutils import *
-from code.stringutils import *
+from code.fileutils import makeDir
+from code.stringutils import stripWindows, stripNewLine
 
 mapsConfFile = "newserverdata/conf/maps.conf"
 mapsIndexFile = "newserverdata/db/map_index.txt"