Keeps rendering progress

1 files changed, 105 insertions, 16 deletions

diff --git a/wiki/wikigen.py b/wiki/wikigen.py
index 340dfef..681aa39 100755
--- a/wiki/wikigen.py
+++ b/wiki/wikigen.py
@@ -216,10 +216,10 @@ def newItemDB():
         # sti() block
         if " Id:" in a:
             x.id=sti(a)
-        elif " Name:" in a:
-            x.name=sti(a)
         elif " AegisName:" in a:
             x.aegis=sti(a)
+        elif " Name:" in a:
+            x.name=sti(a)
         elif " Sell:" in a:
             x.price=sti(a)
         elif " Weight:" in a:
@@ -266,7 +266,7 @@ def newItemDB():
     src.close()
 
 def sti(x):
-    return x.replace('\n', '').replace('|', '').replace('(int, defaults to ', '').replace(')', '').replace('Id: ', '').replace('"','').replace("    ","").replace('(string', '').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(';','')
+    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 writeItems():
@@ -277,8 +277,9 @@ def writeItems():
 + [Ammo](#ammo)\n\
 + [Cards](#cards)\n\
 + [Pet Eggs](#pet-eggs)\n\
-+ [1H Weapons](#1h-weapons)\n\
-+ [2H Weapons](#2h-weapons)\n\
++ [Weapons](#weapons)\n\
+  + [1H Weapons](#1h-weapons)\n\
+  + [2H Weapons](#2h-weapons)\n\
 + [Armor](#armor)\n\
   + [Error](#error)\n\
   + [Bonus L](#bonus-l)\n\
@@ -308,6 +309,7 @@ def writeItems():
                     i.maxheal +"|"+
                     i.delheal +"|\n"
                     )
+    wikia.write("\n[↑ Return to top](#items)\n\n")
 
     # Usable Items
     wikia.write("## Usable Items\n")
@@ -321,11 +323,65 @@ def writeItems():
                     i.price +"|"+
                     i.weight +"|\n"
                     )
+    wikia.write("\n[↑ Return to top](#items)\n\n")
+
+    # Generic Items
+    wikia.write("## Generic Items\n")
+    wikia.write("Id|Aegis|Name|Price|Weight|\n")
+    wikia.write("--|-----|----|-----|------|\n")
+    for i in IT_ETC:
+        wikia.write(
+                    i.id +"|"+
+                    i.aegis +"|"+
+                    i.name +"|"+
+                    i.price +"|"+
+                    i.weight +"|\n"
+                    )
+    wikia.write("\n[↑ Return to top](#items)\n\n")
+
+    # Ammo Items
+    wikia.write("## Ammo\n")
+    wikia.write("Id|Aegis|Name|Weight|Atk|Matk|\n")
+    wikia.write("--|-----|----|------|---|----|\n")
+    for i in IT_AMMO:
+        wikia.write(
+                    i.id +"|"+
+                    i.aegis +"|"+
+                    i.name +"|"+
+                    i.weight +"|"+
+                    i.atk +"|"+
+                    i.matk +"|\n"
+                    )
+    wikia.write("\n[↑ Return to top](#items)\n\n")
+
+    # Card Items
+    wikia.write("## Cards\n")
+    wikia.write("Id|Aegis|Name|Price|Weight|\n")
+    wikia.write("--|-----|----|-----|------|\n")
+    for i in IT_CARD:
+        wikia.write(
+                    i.id +"|"+
+                    i.aegis +"|"+
+                    i.name +"|"+
+                    i.price +"|"+
+                    i.weight +"|\n"
+                    )
+    wikia.write("\n[↑ Return to top](#items)\n\n")
+
+    # Pet Egg Items
+    wikia.write("## Pet Eggs\n")
+    wikia.write("Id|Aegis|Name|Weight|\n")
+    wikia.write("--|-----|----|------|\n")
+    for i in IT_PETEGG:
+        wikia.write(
+                    i.id +"|"+
+                    i.aegis +"|"+
+                    i.name +"|"+
+                    i.weight +"|\n"
+                    )
+    wikia.write("\n[↑ Return to top](#items)\n\n")
 
     """
-    IT_AMMO=[]
-    IT_CARD=[]
-    IT_PETEGG=[]
     IT_WEAPON={ 'HAND_1' 1h-weapons
                 'HAND_2' 2h-weapons
     IT_ARMOR={  'MISC' error
@@ -339,21 +395,54 @@ def writeItems():
                 'EQP_GARMENT':
                 'EQP_HAND_L':
                 'EQP_HAND_R':
+    self.atk="0"
+    self.matk="0"
+    self.range="0"
+    self.defs="0"
+
+    # Restrictions (EquipLv)
+    self.lvl="0"
+    self.drop=True
+    self.trade=True
+    self.sell=True
+    self.store=True
+
     """
 
-    # Generic Items
-    wikia.write("## Generic Items\n")
-    wikia.write("Id|Aegis|Name|Price|Weight|\n")
-    wikia.write("--|-----|----|-----|------|\n")
-    for i in IT_ETC:
+    wikia.write("# Weapons\n")
+
+    # 1 Hand Items
+    wikia.write("## 1H Weapons\n")
+    wikia.write("Id|Aegis|Price|Weight|Atk|Matk|Lvl|\n")
+    wikia.write("--|-----|-----|------|---|----|---|\n")
+    for i in IT_WEAPON['HAND_1']:
         wikia.write(
                     i.id +"|"+
-                    i.aegis +"|"+
-                    i.name +"|"+
+                    i.aegis +"|$ "+
                     i.price +"|"+
-                    i.weight +"|\n"
+                    i.weight +"g|Atk: "+
+                    i.atk +"|"+
+                    i.matk +"|Lv: "+
+                    i.lvl +"|\n"
                     )
+    wikia.write("\n[↑ Return to top](#items)\n\n")
 
+    # 2 Hand Items
+    wikia.write("## 2H Weapons\n")
+    wikia.write("Id|Aegis|Price|Weight|Atk|Matk|Lvl|Range|\n")
+    wikia.write("--|-----|-----|------|---|----|---|Range|\n")
+    for i in IT_WEAPON['HAND_2']:
+        wikia.write(
+                    i.id +"|"+
+                    i.aegis +"|$ "+
+                    i.price +"|"+
+                    i.weight +"g|Atk: "+
+                    i.atk +"|"+
+                    i.matk +"|Lv: "+
+                    i.lvl +"|"+
+                    i.range + "|\n"
+                    )
+    wikia.write("\n[↑ Return to top](#items)\n\n")
 
 showHeader()