diff options
| author | wushin <pasekei@gmail.com> | 2015-02-16 21:32:33 -0600 |
|---|---|---|
| committer | wushin <pasekei@gmail.com> | 2015-02-17 00:11:28 -0600 |
| commit | 7b35af2e20b7b6eb7fa6086f5b621e900131a583 (patch) | |
| tree | bb759bc53e965660ce7c0aab88b7b1766b6a22e6 | |
| parent | 3d47789c6a19655b0d46ab260f51d6d6c69d1bf2 (diff) | |
| download | evol-tools-7b35af2e20b7b6eb7fa6086f5b621e900131a583.tar.gz evol-tools-7b35af2e20b7b6eb7fa6086f5b621e900131a583.tar.bz2 evol-tools-7b35af2e20b7b6eb7fa6086f5b621e900131a583.tar.xz evol-tools-7b35af2e20b7b6eb7fa6086f5b621e900131a583.zip | |
Herceles: tmw convertor: fix removing existing files
| -rw-r--r-- | hercules/code/server/tmw/itemdb.py | 4 | ||||
| -rw-r--r-- | hercules/code/server/tmw/main.py | 5 | ||||
| -rw-r--r-- | hercules/code/server/tmw/npcs.py | 4 |
3 files changed, 12 insertions, 1 deletions
diff --git a/hercules/code/server/tmw/itemdb.py b/hercules/code/server/tmw/itemdb.py index 96f5cd0..26b4701 100644 --- a/hercules/code/server/tmw/itemdb.py +++ b/hercules/code/server/tmw/itemdb.py @@ -18,7 +18,11 @@ def getItemDbFile(srcDir): def convertItemDb(): srcDir = "oldserverdata/world/map/db/" dstFile = "newserverdata/db/re/item_db.conf" + if os.path.isfile(dstFile): + os.remove(dstFile) constsFile = "newserverdata/db/const.txt" + if os.path.isfile(constsFile): + os.remove(constsFile) fieldsSplit = re.compile(",") scriptsSplit = re.compile("{") items = dict() diff --git a/hercules/code/server/tmw/main.py b/hercules/code/server/tmw/main.py index 4822199..6cd8f07 100644 --- a/hercules/code/server/tmw/main.py +++ b/hercules/code/server/tmw/main.py @@ -14,7 +14,10 @@ from code.server.questsdb import * from code.serverutils import * def serverTmwMain(): - cleanServerData() + try: + cleanServerData() + except: + print "Updating server" createMainScript() items = convertItemDb() convertNpcs(items) diff --git a/hercules/code/server/tmw/npcs.py b/hercules/code/server/tmw/npcs.py index c7edea2..8f26197 100644 --- a/hercules/code/server/tmw/npcs.py +++ b/hercules/code/server/tmw/npcs.py @@ -9,7 +9,11 @@ from code.fileutils import * from code.stringutils import * mapsConfFile = "newserverdata/conf/maps.conf" +if os.path.isfile(mapsConfFile): + os.remove(mapsConfFile) mapsIndexFile = "newserverdata/db/map_index.txt" +if os.path.isfile(mapsIndexFile): + os.remove(mapsIndexFile) npcMainScript = "newserverdata/npc/re/scripts_main.conf" mapsIndex = 1 scriptRe = re.compile("^(((?P<map>[^/](.+)),([ ]*)(?P<x>[\d]+),([ ]*)(?P<y>[\d]+),([ ]*)(?P<dir>[\d]+))|(?P<function>function)|-)" + |