Improvements to wikigen drop handling. Thanks Micksha

1 files changed, 14 insertions, 2 deletions

diff --git a/wiki/wikigen.py b/wiki/wikigen.py
index 8aa8c89..c88d037 100755
--- a/wiki/wikigen.py
+++ b/wiki/wikigen.py
@@ -152,7 +152,7 @@ def testMobs():
         elif dropper and '}' in a:
             dropper=False
         elif dropper:
-            x.drops.append(stp(a))
+            x.drops.append(stp(a).split(": "))
     # Write last entry
     MobAlloc(x)
 
@@ -239,7 +239,19 @@ def mb_rdrw(mb):
 def mb_rddrop(mb):
     buff=""
     for ax in mb.drops:
-        buff+=ax+'\n'
+        # Ignore disabled drops
+        if ax[0].startswith("//"):
+            continue
+
+        # Write drop
+        try:
+            buff+=ax[0]+': ' + str(int(ax[1])/100.0) + ' %\n'
+        except IndexError:
+            print("Fatal: invalid %s mob with %s drops" % (mb.name, str(ax)))
+            exit(1)
+        except:
+            print("[Warning] %s incorrect drop: %s" % (mb.name, str(ax)))
+            buff+=ax[0]+': ' + ax[1] + ' ppm\n'
     return buff