7 files changed, 36 insertions, 35 deletions
diff --git a/hercules/code/server/tmw/athena.py b/hercules/code/server/tmw/athena.py
index 4c59ea1..6ad3e9c 100644
--- a/hercules/code/server/tmw/athena.py
+++ b/hercules/code/server/tmw/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
+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/tmw/consts.py b/hercules/code/server/tmw/consts.py
index c3ca848..5b8403e 100644
--- a/hercules/code/server/tmw/consts.py
+++ b/hercules/code/server/tmw/consts.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 readFile
+from code.stringutils import stripNewLine
 
 fieldsSplit = re.compile(":")
 
diff --git a/hercules/code/server/tmw/itemdb.py b/hercules/code/server/tmw/itemdb.py
index 0729fc3..beccd09 100644
--- a/hercules/code/server/tmw/itemdb.py
+++ b/hercules/code/server/tmw/itemdb.py
@@ -3,11 +3,11 @@
 # Copyright (C) 2014  Evol Online
 # Author: Andrei Karas (4144)
 
+import os
 import re
 
-from code.configutils import *
-from code.fileutils import *
-from code.stringutils import *
+from code.configutils import writeStartScript, writeEndScript, writeIntField, writeStrField
+from code.fileutils import readFile
 
 def getItemDbFile(srcDir):
     files = os.listdir(srcDir)
diff --git a/hercules/code/server/tmw/main.py b/hercules/code/server/tmw/main.py
index 59363ac..f3dd10d 100644
--- a/hercules/code/server/tmw/main.py
+++ b/hercules/code/server/tmw/main.py
@@ -4,23 +4,23 @@
 # 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.tmw.athena import *
-from code.server.tmw.consts import *
-from code.server.tmw.itemdb import *
-from code.server.tmw.mobdb import *
-from code.server.tmw.mobskilldb import *
-from code.server.tmw.npcs import *
-from code.server.utils import *
-from code.server.questsdb import *
-from code.serverutils import *
+from sets import Set
+
+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 saveCharTableCustom
+from code.server.db.charregnumdb import saveCharRegNumDbTable
+from code.server.db.inventory import saveInventoryTable
+from code.server.db.skill import saveSkillTable
+from code.server.tmw.athena import readAthena
+from code.server.tmw.consts import convertConsts
+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
 
 def serverTmwMain(isNew):
     try:
diff --git a/hercules/code/server/tmw/mobdb.py b/hercules/code/server/tmw/mobdb.py
index 652a203..04d1fce 100644
--- a/hercules/code/server/tmw/mobdb.py
+++ b/hercules/code/server/tmw/mobdb.py
@@ -3,11 +3,12 @@
 # Copyright (C) 2014  Evol Online
 # Author: Andrei Karas (4144)
 
-import re, math
+import math
+import os
+import re
 
-from code.configutils import *
-from code.fileutils import *
-from code.stringutils import *
+from code.configutils import isHaveData, writeCondField2, writeStartBlock, writeEndBlock, writeIntField, writeStrField, writeFieldArr, writeIntField2, writeFieldList, writeSubField
+from code.fileutils import readFile
 
 def getMobDbFile(srcDir):
     files = os.listdir(srcDir)
diff --git a/hercules/code/server/tmw/mobskilldb.py b/hercules/code/server/tmw/mobskilldb.py
index cba7d70..7188824 100644
--- a/hercules/code/server/tmw/mobskilldb.py
+++ b/hercules/code/server/tmw/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/world/map/db/mob_skill_db.txt"
diff --git a/hercules/code/server/tmw/npcs.py b/hercules/code/server/tmw/npcs.py
index dc73d75..c51da78 100644
--- a/hercules/code/server/tmw/npcs.py
+++ b/hercules/code/server/tmw/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"
 if os.path.isfile(mapsConfFile):