You can change wikigen's default read files

2 files changed, 23 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index 34b346b..d482f82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ update/upload
 !update/adler32.c
 update/adler32
 update/files/Bugfix-*
+update/save*
 
 hercules_update/files
 hercules_update/upload
@@ -64,3 +65,11 @@ web/po/*
 
 # Proccessed other server data
 hercules/data*
+hercules/osd*
+hercules/old*
+
+# Diffs and Patches related files
+*.diff
+*.patch
+*.orig
+*.rej
diff --git a/wiki/wikigen.py b/wiki/wikigen.py
index b81ef25..5b5adea 100755
--- a/wiki/wikigen.py
+++ b/wiki/wikigen.py
@@ -53,6 +53,7 @@ def showHeader():
     print("TMW2 Wiki Generator")
     ##print "Evol client data validator."
     print("Run at: " + datetime.datetime.now().isoformat())
+    print("Usage: ./wikigen.py [<path_to_serverdata> <path_to_clientdata>]")
     ##print "https://gitlab.com/evol/evol-tools/blob/master/testxml/testxml.py"
     printSeparator()
 
@@ -115,7 +116,11 @@ def MobAlloc(ab):
 
 def testMobs():
     print("\nGenerating Mob Wiki...")
-    src=open("../../server-data/db/re/mob_db.conf", "r")
+    if len(sys.argv) >= 2:
+        src=open(sys.argv[1]+"/db/re/mob_db.conf", "r")
+    else:
+        src=open("../../server-data/db/re/mob_db.conf", "r")
+
     wikib.write("# Monster Database\n")
     start=False
     dropper=False
@@ -380,7 +385,10 @@ def ItAlloc(it):
 
 def newItemDB():
     print("\nGenerating Item Wiki...")
-    src=open("../../server-data/db/re/item_db.conf", "r")
+    if len(sys.argv) >= 2:
+        src=open(sys.argv[1]+"/db/re/item_db.conf", "r")
+    else:
+        src=open("../../server-data/db/re/item_db.conf", "r")
 
     x=It()
     for a in src:
@@ -681,7 +689,10 @@ def qnt2(string):
 
 def DoQuest():
     print("\nGenerating Quest Wiki...")
-    src=open("../../client-data/quests.xml", "r")
+    if len(sys.argv) >= 3:
+        src=open(sys.argv[2]+"/quests.xml", "r")
+    else:
+        src=open("../../client-data/quests.xml", "r")
 
     qlog=[]
     q=Quest(-1)