Register new Python formula, fix an error on Aeros Event Master

2 files changed, 8 insertions, 7 deletions

diff --git a/npc/001-1/eventmaster.txt b/npc/001-1/eventmaster.txt
index 6446185d3..dd3fd9853 100644
--- a/npc/001-1/eventmaster.txt
+++ b/npc/001-1/eventmaster.txt
@@ -18,7 +18,7 @@
             areamonster("001-1", 20, 20, 340, 160, strmobinfo(1, getarg(1)), getarg(1), getarg(2), "Mana Being#001-1::OnAerosMobDeath");
             break;
         default:
-            areamonster("001-1", 171, 320, 158, 340, strmobinfo(1, getarg(1)), getarg(1), getarg(2), "Mana Being#001-1::OnAerosMobDeath");
+            areamonster("001-1", 171, 20, 340, 160, strmobinfo(1, getarg(1)), getarg(1), getarg(2), "Mana Being#001-1::OnAerosMobDeath");
             break;
         }
     }
@@ -50,7 +50,7 @@
         case 2:
             shovel_scatter("001-1", 20, 20, 340, 160, getarg(0), getarg(1,1));
         default:
-            shovel_scatter("001-1",171,158, 320, 340, getarg(0), getarg(1,1));
+            shovel_scatter("001-1",171, 20, 340, 160, getarg(0), getarg(1,1));
         }
     }
 
diff --git a/npc/018-2-2/main.txt b/npc/018-2-2/main.txt
index 2d0c819c5..b4978d3ed 100644
--- a/npc/018-2-2/main.txt
+++ b/npc/018-2-2/main.txt
@@ -299,16 +299,17 @@ OnMaster14:
 }
 
 /*python
-df=[('Novice', 21),
-    ('Intermed', 20),
-    ('Advanc', 18),
-    ('Expert', 15),
-    ('Master', 15)]
+df=[('Novice',   21, 1),
+    ('Intermed', 20, 10),
+    ('Advanc',   18, 100),
+    ('Expert',   15, 1000),
+    ('Master',   15, 10000)]
 
 for a in df:
     i=0
     while (i < a[1]):
         print('On%s%d:' % (a[0], i))
+        print('    if (rand(0, 2000) >= readparam(Luk)+(strmobinfo(3,.%s_Mobs[%d])*5)+strmobinfo(7,.%s_Mobs[%d])) {getmapxy(.@m$, .@x, .@y, 0); makeitem(HeroCoin, %s, .@m$, .@x, .@y);}' % (a[0], i, a[0], i, a[2]))
         print('    areamonster "018-2-2@%s", 20, 20, 220, 220, strmobinfo(1, .%s_Mobs[%d]), .%s_Mobs[%d], .%s_Ammo[%d], "#HH_CONTROLLER01::On%s%d"; end;' % (a[0][:1],a[0],i,a[0],i,a[0],i,a[0],i))
         i+=1
 */