Move the remaining item tables to HTML

1 files changed, 10 insertions, 14 deletions

diff --git a/wiki/wikigen.py b/wiki/wikigen.py
index 3607856..24f2e8f 100755
--- a/wiki/wikigen.py
+++ b/wiki/wikigen.py
@@ -505,7 +505,7 @@ def hl(it):
 #    wikia.write("Id|Aegis|Name|Weight|Atk|Matk|\n")
 #    wikia.write("Id|Aegis|Name|Price|Weight|\n")
 
-def ItemWrite(tbl, ID=False, AEGIS=False, NAME=False, PRICE=False, WEIGHT=False, LVL=False, ATK=False, RANGE=False, HEALING=False):
+def ItemWrite(tbl, ID=False, AEGIS=False, NAME=False, PRICE=False, WEIGHT=False, DEF=False, LVL=False, ATK=False, RANGE=False, HEALING=False, SCRIPT=False):
     wikia.write("<table border=1>\n")
     wikia.write("<tr>")
     if ID:
@@ -518,6 +518,8 @@ def ItemWrite(tbl, ID=False, AEGIS=False, NAME=False, PRICE=False, WEIGHT=False,
         wikia.write("<th>Price</th>")
     if WEIGHT:
         wikia.write("<th>Weight</th>")
+    if DEF:
+        wikia.write("<th>Def</th>")
     if LVL:
         wikia.write("<th>Lvl</th>")
     if ATK:
@@ -529,6 +531,8 @@ def ItemWrite(tbl, ID=False, AEGIS=False, NAME=False, PRICE=False, WEIGHT=False,
         wikia.write("<th>Min</th>")
         wikia.write("<th>Max</th>")
         wikia.write("<th>Delay</th>")
+    if SCRIPT:
+        wikia.write("<th>Script</th>")
 
     wikia.write("</tr>\n")
 
@@ -545,6 +549,8 @@ def ItemWrite(tbl, ID=False, AEGIS=False, NAME=False, PRICE=False, WEIGHT=False,
             wikia.write("<td>%s GP</td>" % i.price)
         if WEIGHT:
             wikia.write("<td>%s g</td>" % i.weight)
+        if DEF:
+            wikia.write("<td>Def: %s</td>" % i.defs)
         if LVL:
             wikia.write("<td>Lv: %s</td>" % i.lvl)
         if ATK:
@@ -556,6 +562,8 @@ def ItemWrite(tbl, ID=False, AEGIS=False, NAME=False, PRICE=False, WEIGHT=False,
             wikia.write("<td>%s</td>" % i.minheal)
             wikia.write("<td>%s</td>" % i.maxheal)
             wikia.write("<td>%s s</td>" % i.delheal)
+        if SCRIPT:
+            wikia.write("<td>%s</td>" % i.script)
 
         wikia.write("</tr>")
 
@@ -564,19 +572,7 @@ def ItemWrite(tbl, ID=False, AEGIS=False, NAME=False, PRICE=False, WEIGHT=False,
 
 def ArmorWrite(name,scope):
     wikia.write("## "+name+"\n")
-    wikia.write("Id|Aegis|Price|Weight|Def|Lvl|Script|\n")
-    wikia.write("--|-----|-----|------|---|---|------|\n")
-    for i in IT_ARMOR[scope]:
-        wikia.write(
-                    i.id +"|"+
-                    hl(i) +"|"+
-                    i.price +" GP|"+
-                    i.weight +"g|Def: "+
-                    i.defs +"|Lv: "+
-                    i.lvl +"|"+
-                    str(i.script) + "|\n"
-                    )
-    wikia.write("\n[(↑) Return to top](#items)\n\n")
+    ItemWrite(IT_ARMOR[scope], ID=True, AEGIS=True, PRICE=True, WEIGHT=True, DEF=True, LVL=True, SCRIPT=True)
 
 showHeader()