Fix MobPoints() wrong calls

13 files changed, 56 insertions, 97 deletions

diff --git a/npc/012-1/flowerpentagram2.txt b/npc/012-1/flowerpentagram2.txt
index 92de4de5..f10524d3 100644
--- a/npc/012-1/flowerpentagram2.txt
+++ b/npc/012-1/flowerpentagram2.txt
@@ -48,23 +48,19 @@ L_Place:
     end;
 
 OnSquirrelDeath:
-    @mobId = 1105;
-    callfunc "MobPoints";
+    fix_mobkill(1105);
     end;
 
 OnMushroomDeath:
-    @mobId = 1106;
-    callfunc "MobPoints";
+    fix_mobkill(1106);
     end;
 
 OnScorpionDeath:
-    @mobId = 1003;
-    callfunc "MobPoints";
+    fix_mobkill(1003);
     end;
 
 OnRScorpionDeath:
-    @mobId = 1004;
-    callfunc "MobPoints";
+    fix_mobkill(1004);
     end;
 
 L_MonstersAlive:
diff --git a/npc/013-1/flowerpentagram.txt b/npc/013-1/flowerpentagram.txt
index 195ada0f..1df7bd77 100644
--- a/npc/013-1/flowerpentagram.txt
+++ b/npc/013-1/flowerpentagram.txt
@@ -36,43 +36,35 @@ OnSummon:
     end;
 
 OnSquirrelDeath:
-    @mobId = 1105;
-    callfunc "MobPoints";
+    fix_mobkill(1105);
     end;
 
 OnMushroomDeath:
-    @mobId = 1106;
-    callfunc "MobPoints";
+    fix_mobkill(1106);
     end;
 
 OnBlueparDeath:
-    @mobId = 1107;
-    callfunc "MobPoints";
+    fix_mobkill(1107);
     end;
 
 OnMoubooDeath:
-    @mobId = 1104;
-    callfunc "MobPoints";
+    fix_mobkill(1104);
     end;
 
 OnScorpionDeath:
-    @mobId = 1003;
-    callfunc "MobPoints";
+    fix_mobkill(1003);
     end;
 
 OnRScorpionDeath:
-    @mobId = 1004;
-    callfunc "MobPoints";
+    fix_mobkill(1004);
     end;
 
 OnAScorpionDeath:
-    @mobId = 1057;
-    callfunc "MobPoints";
+    fix_mobkill(1057);
     end;
 
 OnBScorpionDeath:
-    @mobId = 1009;
-    callfunc "MobPoints";
+    fix_mobkill(1009);
     end;
 
 S_CleanUp:
diff --git a/npc/017-1/flowerpentagram1.txt b/npc/017-1/flowerpentagram1.txt
index a1e60856..8d2d7118 100644
--- a/npc/017-1/flowerpentagram1.txt
+++ b/npc/017-1/flowerpentagram1.txt
@@ -43,13 +43,11 @@ L_Place:
     end;
 
 OnSquirrelDeath:
-    @mobId = 1105;
-    callfunc "MobPoints";
+    fix_mobkill(1105);
     end;
 
 OnScorpionDeath:
-    @mobId = 1003;
-    callfunc "MobPoints";
+    fix_mobkill(1003);
     end;
 
 L_MonstersAlive:
diff --git a/npc/017-1/flowerpentagram5.txt b/npc/017-1/flowerpentagram5.txt
index d13805f9..c9f6d5af 100644
--- a/npc/017-1/flowerpentagram5.txt
+++ b/npc/017-1/flowerpentagram5.txt
@@ -65,43 +65,35 @@ L_Place:
     end;
 
 OnSquirrelDeath:
-    @mobId = 1105;
-    callfunc "MobPoints";
+    fix_mobkill(1105);
     end;
 
 OnMushroomDeath:
-    @mobId = 1106;
-    callfunc "MobPoints";
+    fix_mobkill(1106);
     end;
 
 OnBlueparDeath:
-    @mobId = 1107;
-    callfunc "MobPoints";
+    fix_mobkill(1107);
     end;
 
 OnMoubooDeath:
-    @mobId = 1104;
-    callfunc "MobPoints";
+    fix_mobkill(1104);
     end;
 
 OnScorpionDeath:
-    @mobId = 1003;
-    callfunc "MobPoints";
+    fix_mobkill(1003);
     end;
 
 OnRScorpionDeath:
-    @mobId = 1004;
-    callfunc "MobPoints";
+    fix_mobkill(1004);
     end;
 
 OnAScorpionDeath:
-    @mobId = 1057;
-    callfunc "MobPoints";
+    fix_mobkill(1057);
     end;
 
 OnBScorpionDeath:
-    @mobId = 1009;
-    callfunc "MobPoints";
+    fix_mobkill(1009);
     end;
 
 L_TooEarly:
diff --git a/npc/018-1/flowerpentagram3.txt b/npc/018-1/flowerpentagram3.txt
index 53f45dbe..a24dd0cb 100644
--- a/npc/018-1/flowerpentagram3.txt
+++ b/npc/018-1/flowerpentagram3.txt
@@ -52,33 +52,27 @@ L_Place:
     end;
 
 OnSquirrelDeath:
-    @mobId = 1105;
-    callfunc "MobPoints";
+    fix_mobkill(1105);
     end;
 
 OnMushroomDeath:
-    @mobId = 1106;
-    callfunc "MobPoints";
+    fix_mobkill(1106);
     end;
 
 OnBlueparDeath:
-    @mobId = 1107;
-    callfunc "MobPoints";
+    fix_mobkill(1107);
     end;
 
 OnScorpionDeath:
-    @mobId = 1003;
-    callfunc "MobPoints";
+    fix_mobkill(1003);
     end;
 
 OnRScorpionDeath:
-    @mobId = 1004;
-    callfunc "MobPoints";
+    fix_mobkill(1004);
     end;
 
 OnAScorpionDeath:
-    @mobId = 1057;
-    callfunc "MobPoints";
+    fix_mobkill(1057);
     end;
 
 L_MonstersAlive:
diff --git a/npc/027-3/monsters.txt b/npc/027-3/monsters.txt
index 52a2a5eb..d7f3ae5c 100644
--- a/npc/027-3/monsters.txt
+++ b/npc/027-3/monsters.txt
@@ -10,13 +10,13 @@
 On1036:
     @mobId = 1036;
     callsub S_MOBCOUNT_ZOMBIES;
-    callfunc "MobPoints";
+    fix_mobkill(1036);
     end;
 
 On1045:
     @mobId = 1045;
     callsub S_MOBCOUNT_FALLENS;
-    callfunc "MobPoints";
+    fix_mobkill(1045);
     end;
 
 S_MOBCOUNT_ZOMBIES:
diff --git a/npc/027-4/monsters.txt b/npc/027-4/monsters.txt
index 40180670..34fce902 100644
--- a/npc/027-4/monsters.txt
+++ b/npc/027-4/monsters.txt
@@ -11,13 +11,13 @@
 On1036:
     @mobId = 1036;
     callsub S_MOBCOUNT_ZOMBIES;
-    callfunc "MobPoints";
+    fix_mobkill(1036);
     end;
 
 On1045:
     @mobId = 1045;
     callsub S_MOBCOUNT_FALLENS;
-    callfunc "MobPoints";
+    fix_mobkill(1045);
     end;
 
 S_MOBCOUNT_ZOMBIES:
diff --git a/npc/029-1/hasan.txt b/npc/029-1/hasan.txt
index 86bb82e5..7cf89db7 100644
--- a/npc/029-1/hasan.txt
+++ b/npc/029-1/hasan.txt
@@ -182,8 +182,7 @@ OnScorpionDeath:
         goto L_Clean;
     QL_BEGIN = 13;
     message strcharinfo(0), "You saved Hasan.";
-    @mobId = 1003;
-    callfunc "MobPoints";
+    fix_mobkill(Scorpion);
     goto L_Clean;
 
 L_TimeOut:
diff --git a/npc/029-2/barrels.txt b/npc/029-2/barrels.txt
index b44fec43..c5d91621 100644
--- a/npc/029-2/barrels.txt
+++ b/npc/029-2/barrels.txt
@@ -4,8 +4,7 @@
     end;
 
 OnMaggotDeath:
-    @mobId = 1050;
-    callfunc "MobPoints";
+    fix_mobkill(HouseMaggot);
     end;
 }
 029-2,28,86,0	script	Barrel#1	NPC400,{
diff --git a/npc/051-1/desertmonsters.txt b/npc/051-1/desertmonsters.txt
index 08476f32..9424d63e 100644
--- a/npc/051-1/desertmonsters.txt
+++ b/npc/051-1/desertmonsters.txt
@@ -5,9 +5,8 @@
 
 On1096:
     if (rand(4) == 0 && $@illia_progress == 3 && $@illia_level_3_progress == 1)
-        getitem "SealedSoul", 1;
-    @mobId = 1010;
-    callfunc "MobPoints";
+        getitem SealedSoul, 1;
+    fix_mobkill(Snake);
     end;
 
 }
@@ -34,9 +33,9 @@ OnSoulEaterDeath:
     $@SoulEaters0_count = $@SoulEaters0_count - 1;
     if ($@illia_progress != 3 || $@illia_level_3_progress != 1)
         end;
-    if (countitem("SealedSoul") == 0)
+    if (countitem(SealedSoul) == 0)
         end;
-    delitem "SealedSoul", countitem("SealedSoul");
+    delitem SealedSoul, countitem(SealedSoul);
     message strcharinfo(0), "The Soul Eater feeds on the Sealed Souls you are carrying.";
     end;
 }
@@ -62,9 +61,9 @@ OnSoulEaterDeath:
     $@SoulEaters1_count = $@SoulEaters1_count - 1;
     if ($@illia_progress != 3 || $@illia_level_3_progress != 1)
         end;
-    if (countitem("SealedSoul") == 0)
+    if (countitem(SealedSoul) == 0)
         end;
-    delitem "SealedSoul", countitem("SealedSoul");
+    delitem SealedSoul, countitem(SealedSoul);
     message strcharinfo(0), "The Soul Eater feeds on the Sealed Souls you are carrying.";
     end;
 }
@@ -90,9 +89,9 @@ OnSoulEaterDeath:
     $@SoulEaters2_count = $@SoulEaters2_count - 1;
     if ($@illia_progress != 3 || $@illia_level_3_progress != 1)
         end;
-    if (countitem("SealedSoul") == 0)
+    if (countitem(SealedSoul) == 0)
         end;
-    delitem "SealedSoul", countitem("SealedSoul");
+    delitem SealedSoul, countitem(SealedSoul);
     message strcharinfo(0), "The Soul Eater feeds on the Sealed Souls you are carrying.";
     end;
 }
@@ -118,9 +117,9 @@ OnSoulEaterDeath:
     $@SoulEaters3_count = $@SoulEaters3_count - 1;
     if ($@illia_progress != 3 || $@illia_level_3_progress != 1)
         end;
-    if (countitem("SealedSoul") == 0)
+    if (countitem(SealedSoul) == 0)
         end;
-    delitem "SealedSoul", countitem("SealedSoul");
+    delitem SealedSoul, countitem(SealedSoul);
     message strcharinfo(0), "The Soul Eater feeds on the Sealed Souls you are carrying.";
     end;
 }
@@ -146,9 +145,9 @@ OnSoulEaterDeath:
     $@SoulEaters4_count = $@SoulEaters4_count - 1;
     if ($@illia_progress != 3 || $@illia_level_3_progress != 1)
         end;
-    if (countitem("SealedSoul") == 0)
+    if (countitem(SealedSoul) == 0)
         end;
-    delitem "SealedSoul", countitem("SealedSoul");
+    delitem SealedSoul, countitem(SealedSoul);
     message strcharinfo(0), "The Soul Eater feeds on the Sealed Souls you are carrying.";
     end;
 }
diff --git a/npc/051-3/jailslimes.txt b/npc/051-3/jailslimes.txt
index 598f94f2..169fe7a3 100644
--- a/npc/051-3/jailslimes.txt
+++ b/npc/051-3/jailslimes.txt
@@ -22,8 +22,7 @@ L_GiveLockPicks:
     goto L_End;
 
 L_End:
-    @mobId = 1098;
-    callfunc "MobPoints";
+    fix_mobkill(1098);
     end;
 
 }
diff --git a/npc/055-1/flowerpentagram4.txt b/npc/055-1/flowerpentagram4.txt
index 12e0f833..f310e218 100644
--- a/npc/055-1/flowerpentagram4.txt
+++ b/npc/055-1/flowerpentagram4.txt
@@ -56,43 +56,35 @@ L_Place:
     end;
 
 OnSquirrelDeath:
-    @mobId = 1105;
-    callfunc "MobPoints";
+    fix_mobkill(1105);
     end;
 
 OnMushroomDeath:
-    @mobId = 1106;
-    callfunc "MobPoints";
+    fix_mobkill(1106);
     end;
 
 OnBlueparDeath:
-    @mobId = 1107;
-    callfunc "MobPoints";
+    fix_mobkill(1107);
     end;
 
 OnMoubooDeath:
-    @mobId = 1104;
-    callfunc "MobPoints";
+    fix_mobkill(1104);
     end;
 
 OnScorpionDeath:
-    @mobId = 1003;
-    callfunc "MobPoints";
+    fix_mobkill(1003);
     end;
 
 OnRScorpionDeath:
-    @mobId = 1004;
-    callfunc "MobPoints";
+    fix_mobkill(1004);
     end;
 
 OnAScorpionDeath:
-    @mobId = 1057;
-    callfunc "MobPoints";
+    fix_mobkill(1057);
     end;
 
 OnBScorpionDeath:
-    @mobId = 1009;
-    callfunc "MobPoints";
+    fix_mobkill(1009);
     end;
 
 L_MonstersAlive:
diff --git a/npc/055-1/pumpkins.txt b/npc/055-1/pumpkins.txt
index 8f243d46..d008d389 100644
--- a/npc/055-1/pumpkins.txt
+++ b/npc/055-1/pumpkins.txt
@@ -20,8 +20,7 @@
     if (countitem("PumpkinSeeds") >= $@halloween_num_seeds)
         goto L_EnoughSeeds;
 
-    @mobId = 1063;
-    callfunc "MobPoints";
+    fix_mobkill(1063);
     goto L_Destroy;
 
 L_EnoughSeeds: