Who drops what items?

1 files changed, 30 insertions, 12 deletions

diff --git a/wiki/wikigen.py b/wiki/wikigen.py
index 24f2e8f..af8842d 100755
--- a/wiki/wikigen.py
+++ b/wiki/wikigen.py
@@ -32,7 +32,14 @@ IT_ARMOR={  'MISC': [],             # FOR FAILURE
             'EQP_HEAD_TOP':[],      # HATS/HELMETS
             'EQP_HAND_L': []}       # SHIELDS
 
+Mobs1=[]
+Mobs2=[]
+Mobs3=[]
+Mobs4=[]
+Mobs5=[]
+MobsA=[]
 
+SysDrops=[]
 
 
 def printSeparator():
@@ -77,13 +84,6 @@ class Mob:
     self.delay="0"
     self.drops=[]
 
-Mobs1=[]
-Mobs2=[]
-Mobs3=[]
-Mobs4=[]
-Mobs5=[]
-MobsA=[]
-
 def MobAlloc(ab):
     try:
         maab=int(ab.mobpt)
@@ -252,6 +252,10 @@ def mb_rddrop(mb):
         except:
             print("[Warning] %s incorrect drop: %s" % (mb.name, str(ax)))
             buff+=ax[0]+': ' + ax[1] + ' ppm\n'
+
+        # Save to SysDrops
+        SysDrops.append([ax[0], ax[1], mb.name])
+
     return buff
 
 
@@ -437,15 +441,15 @@ def writeItems():
 
     # Healing Items
     wikia.write("## Healing Items\n\n")
-    ItemWrite(IT_HEALING, ID=True, AEGIS=True, PRICE=True, WEIGHT=True, HEALING=True)
+    ItemWrite(IT_HEALING, ID=True, AEGIS=True, PRICE=True, WEIGHT=True, HEALING=True, DROPPER=True)
 
     # Usable Items
     wikia.write("## Usable Items\n")
-    ItemWrite(IT_USABLE, ID=True, AEGIS=True, NAME=True, PRICE=True, WEIGHT=True)
+    ItemWrite(IT_USABLE, ID=True, AEGIS=True, NAME=True, PRICE=True, WEIGHT=True, DROPPER=True)
 
     # Generic Items
     wikia.write("## Generic Items\n")
-    ItemWrite(IT_ETC, ID=True, AEGIS=True, NAME=True, PRICE=True, WEIGHT=True)
+    ItemWrite(IT_ETC, ID=True, AEGIS=True, NAME=True, PRICE=True, WEIGHT=True, DROPPER=True)
 
     # Ammo Items
     wikia.write("## Ammo\n")
@@ -464,7 +468,7 @@ def writeItems():
 
     # 1 Hand Items
     wikia.write("## 1H Weapons\n")
-    ItemWrite(IT_WEAPON['HAND_1'], ID=True, AEGIS=True, PRICE=True, WEIGHT=True, ATK=True, LVL=True)
+    ItemWrite(IT_WEAPON['HAND_1'], ID=True, AEGIS=True, PRICE=True, WEIGHT=True, ATK=True, LVL=True, DROPPER=True)
 
     # 2 Hand Items
     wikia.write("## 2H Weapons\n")
@@ -505,7 +509,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, DEF=False, LVL=False, ATK=False, RANGE=False, HEALING=False, SCRIPT=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, DROPPER=False):
     wikia.write("<table border=1>\n")
     wikia.write("<tr>")
     if ID:
@@ -533,6 +537,8 @@ def ItemWrite(tbl, ID=False, AEGIS=False, NAME=False, PRICE=False, WEIGHT=False,
         wikia.write("<th>Delay</th>")
     if SCRIPT:
         wikia.write("<th>Script</th>")
+    if DROPPER:
+        wikia.write("<th>Mobs</th>")
 
     wikia.write("</tr>\n")
 
@@ -564,6 +570,18 @@ def ItemWrite(tbl, ID=False, AEGIS=False, NAME=False, PRICE=False, WEIGHT=False,
             wikia.write("<td>%s s</td>" % i.delheal)
         if SCRIPT:
             wikia.write("<td>%s</td>" % i.script)
+        if DROPPER:
+            tmp_droppers=""
+            tmp_drpalign=[]
+            for ax in SysDrops:
+                if ax[0] == i.aegis:
+                    tmp_drpalign.append([ax[2], ax[1]])
+            if len(tmp_drpalign) > 0:
+                for a in sorted(tmp_drpalign):
+                        tmp_droppers+=("%s: %s ppm\n" % (a[0], a[1]))
+                wikia.write("<td>%s</td>" % mbdt("monsters", tmp_droppers))
+            else:
+                wikia.write("<td>-</td>")
 
         wikia.write("</tr>")