EleGen v2

1 files changed, 51 insertions, 11 deletions

diff --git a/wiki/elegen.py b/wiki/elegen.py
index cb81edb..b5deb02 100755
--- a/wiki/elegen.py
+++ b/wiki/elegen.py
@@ -47,11 +47,11 @@ def fwalk(wmask):
     if wmask == 'WATER':
         return '<font color=#00f>%s</font>' % (wmask)
     elif wmask == 'AIR':
-        return '<font color=#090>%s</font>' % (wmask)
+        return '<font color=#093>%s</font>' % (wmask)
     elif wmask == 'WALL':
         return '<font color=#f00>%s</font>' % (wmask)
     elif wmask == 'NORMAL' or wmask == 'DEFAULT':
-        return wmask
+        return '<font color=#111>%s</font>' % (wmask)
     else:
         print("Invalid walk mask: "+wmask)
         exit(1)
@@ -96,6 +96,34 @@ def WhatRace(rac):
         print("ERROR, INVALID RACE ID: %d (ID: %s)" % (rc, rac.id))
         exit(1)
 
+def WhatElem(rac):
+    rc=rac.elem
+    tl="ERROR"
+    cl="#F00"
+    if rc == 0:
+        tl,cl="Neutral","#000"
+    elif rc == 1:
+        tl,cl="Water","#00F"
+    elif rc == 2:
+        tl,cl="Earth","#7A0"
+    elif rc == 3:
+        tl,cl="Fire","#F00"
+    elif rc == 4:
+        tl,cl="Wind","#093"
+    elif rc == 5:
+        tl,cl="Poison","#040"
+    elif rc == 6:
+        tl,cl="Holy","#afa"
+    elif rc == 7:
+        tl,cl="Dark","#908"
+    elif rc == 8:
+        tl,cl="Ghost","#404"
+    elif rc == 9:
+        tl,cl="Undead","#440"
+    else:
+        print("ERROR, INVALID ELEM ID: %d (ID: %s)" % (rc, rac.id))
+        exit(1)
+    return "<font color=%s>%s</font>" % (cl, tl)
 class Mob:
   def __init__(self):
     # Basic
@@ -242,18 +270,16 @@ def stp(x):
 def MonsterWrite(tbl):
     # TODO: Check _mobs files to determine the usual monster density (a misc info to aid adding proper drop specs)
     wikib.write("<table border=1>\n")
-    wikib.write("<tr><th>ID</th><th>Name</th><th>HP</th><th>Atk</th><th>Race</th><th>Walk Type</th><th>Misc Info</th><th>Rewards</th><th>Drops</th></tr>\n")
-    #buff+="WalkType: %s\n" % ('error')
+    wikib.write("<tr><th>ID</th><th>Name</th><th>Mob Info</th><th>Elegen</th><th>Misc Info</th><th>Rewards</th><th>Drops</th></tr>\n")
+    #mb_core(mb)
     for i in tbl:
         if i.id == 'ID':
             continue
         wikib.write('<tr><td><a name="' + i.id + '"></a>' +
                     i.id +"</td><td>"+
-                    i.name +"</td><td>HP: "+
-                    i.hp +"</td><td>Atk: "+
-                    i.atk +"</td><td>"+
-                    WhatRace(i) +"</td><td>"+
-                    fwalk(i.walk) +"</td><td>"+
+                    i.name +"</td><td>"+
+                    mb_core(i) +"</td><td>"+
+                    mb_eleg(i) +"</td><td>"+
                     mbdt('misc', mb_rdmisc(i)) +"</td><td>"+
                     mbdt('Exp\'s', mb_rdrw(i)) +"</td><td>"+
                     mbdt('drops', mb_rddrop(i)) +"</td></tr>\n"
@@ -295,7 +321,7 @@ def writeMob():
     wikib.write("<h1 id=8>Ghost</h1>\n\n")
     MonsterWrite(Mobs8)
     wikib.write("<h1 id=9>Undead</h1>\n\n")
-    MonsterWrite(Mobs8)
+    MonsterWrite(Mobs9)
 
     wikib.write("<h1 id=NaN>Error</h1>\n\n")
     MonsterWrite(MobsA)
@@ -306,9 +332,23 @@ def mbdt(summary, content):
 <summary>"+summary+"</summary>\
 <pre>"+content+"</pre></details>"
 
+def mb_core(mb):
+    buff=""
+    buff+="HP: %s<br/>\n" % (mb.hp)
+    buff+="ATK: %s<br/>\n" % (mb.atk)
+    if mb.st != "":
+        buff+="Modes: %s" % (mb.st)
+    return buff
+
+def mb_eleg(mb):
+    buff=""
+    buff+="Race: %s<br/>\n" % (WhatRace(mb))
+    buff+="Walk: %s<br/>\n" % (fwalk(mb.walk))
+    buff+="Element: %s<br/>\n" % (WhatElem(mb))
+    return buff
+
 def mb_rdmisc(mb):
     buff=""
-    buff+="Modes: %s\n" % (mb.st)
     if "agr" in mb.st.lower():
         buff+="View Range: %s\n" % (mb.view)
     buff+="Attack Range: %s\n" % (mb.range)