wikigen updates

1 files changed, 15 insertions, 12 deletions

diff --git a/wiki/wikigen.py b/wiki/wikigen.py
index d9e1aa7..b4c48d6 100755
--- a/wiki/wikigen.py
+++ b/wiki/wikigen.py
@@ -220,7 +220,7 @@ def newItemDB():
         elif " AegisName:" in a:
             x.aegis=sti(a)
         elif " Name:" in a:
-            x.name=sti(a)
+            x.name=stin(a)
         elif " Sell:" in a:
             x.price=sti(a)
         elif " Weight:" in a:
@@ -269,6 +269,9 @@ def newItemDB():
 def sti(x):
     return x.replace('\n', '').replace('|', '').replace(')', '').replace('Id: ', '').replace('"','').replace("    ","").replace('AegisName: ', '').replace('Name: ','').replace('Sell: ', '').replace('Weight: ', '').replace('Type: ', '').replace('Loc: ', '').replace('Atk: ', '').replace('Matk: ', '').replace('Range: ', '').replace('Def: ', '').replace('EquipLv: ', '').replace(" ", "").replace('@min=','').replace('@max=','').replace('@delay=','').replace(';','')
 
+def stin(x):
+    return x.replace('\n', '').replace('|', '').replace(')', '').replace('Id: ', '').replace('"','').replace("    ","").replace('Name: ','').replace(';','')
+
 
 def writeItems():
     wikia.write("# Items\n\
@@ -309,11 +312,11 @@ def writeItems():
         wikia.write(
                     i.id +"|"+
                     hl(i) +"|"+
-                    i.price +"|"+
-                    i.weight +"|"+
+                    i.price +" GP|"+
+                    i.weight +"g|"+
                     i.minheal +"|"+
                     i.maxheal +"|"+
-                    i.delheal +"|\n"
+                    i.delheal +"s|\n"
                     )
     wikia.write("\n[(↑) Return to top](#items)\n\n")
 
@@ -326,8 +329,8 @@ def writeItems():
                     i.id +"|"+
                     hl(i) +"|"+
                     i.name +"|"+
-                    i.price +"|"+
-                    i.weight +"|\n"
+                    i.price +" GP|"+
+                    i.weight +"g|\n"
                     )
     wikia.write("\n[(↑) Return to top](#items)\n\n")
 
@@ -340,8 +343,8 @@ def writeItems():
                     i.id +"|"+
                     hl(i) +"|"+
                     i.name +"|"+
-                    i.price +"|"+
-                    i.weight +"|\n"
+                    i.price +" GP|"+
+                    i.weight +"g|\n"
                     )
     wikia.write("\n[(↑) Return to top](#items)\n\n")
 
@@ -354,7 +357,7 @@ def writeItems():
                     i.id +"|"+
                     hl(i) +"|"+
                     i.name +"|"+
-                    i.weight +"|"+
+                    i.weight +"g|"+
                     i.atk +"|"+
                     i.matk +"|\n"
                     )
@@ -369,8 +372,8 @@ def writeItems():
                     i.id +"|"+
                     hl(i) +"|"+
                     i.name +"|"+
-                    i.price +"|"+
-                    i.weight +"|\n"
+                    i.price +" GP|"+
+                    i.weight +"g|\n"
                     )
     wikia.write("\n[(↑) Return to top](#items)\n\n")
 
@@ -383,7 +386,7 @@ def writeItems():
                     i.id +"|"+
                     hl(i) +"|"+
                     i.name +"|"+
-                    i.weight +"|\n"
+                    i.weight +"g|\n"
                     )
     wikia.write("\n[(↑) Return to top](#items)\n\n")