Simplify some code

1 files changed, 12 insertions, 25 deletions

diff --git a/wiki/wikigen.py b/wiki/wikigen.py
index 44a67b3..2ed05b9 100755
--- a/wiki/wikigen.py
+++ b/wiki/wikigen.py
@@ -152,17 +152,10 @@ def stp(x):
     return x.replace('\n', '').replace('|', '').replace('(int, defaults to ', '').replace(')', '').replace('basic experience', '').replace('"','').replace("    ","").replace('(string', '').replace('Name: ','').replace('AttackDelay: ', '').replace('MoveSpeed: ', '').replace('AttackRange: ', '').replace('ViewRange: ','').replace('Attack: ','').replace('ViewRange: ','').replace('Hp: ','').replace('Id: ','').replace('Lv: ','').replace('view range','').replace('attack range','').replace('move speed','').replace('health','').replace('(int','').replace('attack delay','atk.')
 
 
-def writeMob():
-    wikib.write("\
-+ [Aggressive Monsters](#aggressive-monsters)\n\
-+ [Normal Monsters](#normal-monsters)\n\n\
-    ")
-
-    wikib.write("## Aggressive Monsters\n\n")
-
+def MonsterWrite(tbl):
     wikib.write("<table border=1>\n")
     wikib.write("<tr><th>ID</th><th>Name</th><th>HP</th><th>Atk</th><th>Delay</th><th>Modes</th><th>Misc Info</th><th>Rewards</th><th>Drops</th></tr>\n")
-    for i in AggMobs:
+    for i in tbl:
         wikib.write('<tr><td>' +
                     i.id +"</td><td>"+
                     i.name +"</td><td>HP: "+
@@ -177,25 +170,19 @@ def writeMob():
     wikib.write("</table>\n")
     wikib.write("\n[(↑) Return to top](#monster-database)\n\n")
 
+def writeMob():
+    wikib.write("\
++ [Aggressive Monsters](#aggressive-monsters)\n\
++ [Normal Monsters](#normal-monsters)\n\n\
+    ")
+
+    wikib.write("## Aggressive Monsters\n\n")
+    MonsterWrite(AggMobs)
+
 
     wikib.write("## Normal Monsters\n\n")
+    MonsterWrite(NrmMobs)
 
-    wikib.write("<table border=1>\n")
-    wikib.write("<tr><th>ID</th><th>Name</th><th>HP</th><th>Atk</th><th>Delay</th><th>Modes</th><th>Misc Info</th><th>Rewards</th><th>Drops</th></tr>\n")
-    for i in NrmMobs:
-        wikib.write('<tr><td>' +
-                    i.id +"</td><td>"+
-                    i.name +"</td><td>HP: "+
-                    i.hp +"</td><td>Atk: "+
-                    i.atk +"</td><td>"+
-                    i.delay +" ms</td><td>"+
-                    i.st +"</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"
-                    )
-    wikib.write("</table>\n")
-    wikib.write("\n[(↑) Return to top](#monster-database)\n\n")
 
 def mbdt(summary, content):
     return "<details>\