Ops.

1 files changed, 25 insertions, 25 deletions

diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt
index c578f6c2e..5c5214eb3 100644
--- a/npc/003-1/lieutenantdausen.txt
+++ b/npc/003-1/lieutenantdausen.txt
@@ -133,7 +133,7 @@ OnMKSiege:
     pvpon("003-1");
     pvpon("004-1");
     announce(("##1WARNING! WARNING! Siege starting at Tulimshar!!"), bc_all);
-    areamonster("004-1", 0, 0, 79, 81, l("Black Scorpion"), BlackScorpion, 10, "Lieutenant Dausen::OnBlackScorpionDeath");
+    areamonster("004-1", 0, 0, 79, 81, strmobinfo(1, BlackScorpion), BlackScorpion, 10, "Lieutenant Dausen::OnBlackScorpionDeath");
     initnpctimer;
     end;
 
@@ -146,7 +146,7 @@ L_MKSmall:
     pvpon("003-1");
     pvpon("004-1");
     announce(("##1WARNING! WARNING! Siege starting at Tulimshar!!"), bc_all);
-    areamonster("004-1", 0, 0, 79, 81, l("Black Scorpion"), BlackScorpion, 10, "Lieutenant Dausen::OnBlackScorpionDeath");
+    areamonster("004-1", 0, 0, 79, 81, strmobinfo(1, BlackScorpion), BlackScorpion, 10, "Lieutenant Dausen::OnBlackScorpionDeath");
     initnpctimer;
     close;
 
@@ -159,7 +159,7 @@ L_MKMedium:
     pvpon("003-1");
     pvpon("004-1");
     announce(("##1WARNING! WARNING! Siege starting at Tulimshar!!"), bc_all);
-    areamonster("004-1", 0, 0, 79, 81, l("Black Scorpion"), BlackScorpion, 15, "Lieutenant Dausen::OnBlackScorpionDeath");
+    areamonster("004-1", 0, 0, 79, 81, strmobinfo(1, BlackScorpion), BlackScorpion, 15, "Lieutenant Dausen::OnBlackScorpionDeath");
     initnpctimer;
     close;
 
@@ -172,7 +172,7 @@ L_MKHuge:
     pvpon("003-1");
     pvpon("004-1");
     announce(("##1WARNING! WARNING! Siege starting at Tulimshar!!"), bc_all);
-    areamonster("004-1", 0, 0, 79, 81, l("Black Scorpion"), BlackScorpion, 30, "Lieutenant Dausen::OnBlackScorpionDeath");
+    areamonster("004-1", 0, 0, 79, 81, strmobinfo(1, BlackScorpion), BlackScorpion, 30, "Lieutenant Dausen::OnBlackScorpionDeath");
     initnpctimer;
     close;
 
@@ -180,35 +180,35 @@ OnGuardDeath:
     end;
 
 OnBlackScorpionDeath:
-    areamonster("004-1", 0, 0, 79, 81, l("Black Scorpion"), BlackScorpion, 1, "Lieutenant Dausen::OnBlackScorpionDeath");
+    areamonster("004-1", 0, 0, 79, 81, strmobinfo(1, BlackScorpion), BlackScorpion, 1, "Lieutenant Dausen::OnBlackScorpionDeath");
     getmapxy(.@m$,.@x,.@y,3);
     if (rand(10000) <= 90+($@SIEGE_TULIM*100))
         makeitem StrangeCoin, 1, .@m$, .@x, .@y;
     end;
 
 OnBlackScorpion2Death:
-    areamonster("003-1", 0, 0, 120, 155, l("Black Scorpion"), BlackScorpion, 1, "Lieutenant Dausen::OnBlackScorpion2Death");
+    areamonster("003-1", 0, 0, 120, 155, strmobinfo(1, BlackScorpion), BlackScorpion, 1, "Lieutenant Dausen::OnBlackScorpion2Death");
     getmapxy(.@m$,.@x,.@y,3);
     if (rand(10000) <= 850+($@SIEGE_TULIM*100))
         makeitem StrangeCoin, 1, .@m$, .@x, .@y;
     end;
 
 OnGreenSlimeDeath:
-    areamonster("003-1", 0, 0, 120, 155, l("Green Slime"), 1085, 1, "Lieutenant Dausen::OnGreenSlimeDeath");
+    areamonster("003-1", 0, 0, 120, 155, strmobinfo(1, GreenSlime), GreenSlime, 1, "Lieutenant Dausen::OnGreenSlimeDeath");
     getmapxy(.@m$,.@x,.@y,3);
     if (rand(10000) <= 200+($@SIEGE_TULIM*100))
         makeitem StrangeCoin, 1, .@m$, .@x, .@y;
     end;
 
 OnCandiedSlimeDeath:
-    areamonster("003-1", 0, 0, 120, 155, l("Candied Slime"), 1089, 1, "Lieutenant Dausen::OnCandiedSlimeDeath");
+    areamonster("003-1", 0, 0, 120, 155, strmobinfo(1, CandiedSlime), CandiedSlime, 1, "Lieutenant Dausen::OnCandiedSlimeDeath");
     getmapxy(.@m$,.@x,.@y,3);
     if (rand(10000) <= 150+($@SIEGE_TULIM*100))
         makeitem StrangeCoin, 1, .@m$, .@x, .@y;
     end;
 
 OnManaGhostDeath:
-    areamonster("003-1", 0, 0, 120, 155, l("Mana Ghost"), 1068, 1, "Lieutenant Dausen::OnManaGhostDeath");
+    areamonster("003-1", 0, 0, 120, 155, strmobinfo(1, ManaGhost), ManaGhost, 1, "Lieutenant Dausen::OnManaGhostDeath");
     getmapxy(.@m$,.@x,.@y,3);
     if (rand(10000) <= 900+($@SIEGE_TULIM*100))
         makeitem StrangeCoin, 1, .@m$, .@x, .@y;
@@ -310,8 +310,8 @@ OnTimer60000:
         areamonster("003-1", 0, 0, 120, 155, ("Monster Lieutenant"), 1077, 1, "Lieutenant Dausen::OnLieutenantDeath");
     }
     areamonster("003-1", 0, 0, 120, 155, ("Black Scorpion"), BlackScorpion, 3, "Lieutenant Dausen::OnBlackScorpion2Death");
-    areamonster("003-1", 0, 0, 120, 155, ("Green Slime"), 1085, 10+$@SIEGE_TULIM, "Lieutenant Dausen::OnGreenSlimeDeath");
-    areamonster("003-1", 0, 0, 120, 155, ("Candied Slime"), 1089, 1+$@SIEGE_TULIM, "Lieutenant Dausen::OnCandiedSlimeDeath");
+    areamonster("003-1", 0, 0, 120, 155, strmobinfo(1, GreenSlime), 1085, 10+$@SIEGE_TULIM, "Lieutenant Dausen::OnGreenSlimeDeath");
+    areamonster("003-1", 0, 0, 120, 155, strmobinfo(1, CandiedSlime), 1089, 1+$@SIEGE_TULIM, "Lieutenant Dausen::OnCandiedSlimeDeath");
     end;
 
 OnTimer120000:
@@ -319,42 +319,42 @@ OnTimer120000:
         mapannounce("003-1", "##1The Monster Colonel arrived!", bc_map);
         areamonster("003-1", 0, 0, 120, 155, ("Monster Colonel"), 1036, 1, "Lieutenant Dausen::OnColonelDeath");
     }
-    areamonster("003-1", 0, 0, 120, 155, ("Slime Blast"), 1090, 15);
+    areamonster("003-1", 0, 0, 120, 155, strmobinfo(1, SlimeBlast), 1090, 15);
     areamonster("003-1", 0, 0, 120, 155, ("Black Scorpion"), BlackScorpion, 1, "Lieutenant Dausen::OnBlackScorpion2Death");
-    areamonster("003-1", 0, 0, 120, 155, ("Green Slime"), 1085, 10, "Lieutenant Dausen::OnGreenSlimeDeath");
-    areamonster("003-1", 0, 0, 120, 155, ("Mana Ghost"), 1068, 2, "Lieutenant Dausen::OnManaGhostDeath");
+    areamonster("003-1", 0, 0, 120, 155, strmobinfo(1, GreenSlime), 1085, 10, "Lieutenant Dausen::OnGreenSlimeDeath");
+    areamonster("003-1", 0, 0, 120, 155, strmobinfo(1, ManaGhost), 1068, 2, "Lieutenant Dausen::OnManaGhostDeath");
     end;
 
 OnTimer180000:
-    areamonster("003-1", 0, 0, 120, 155, ("Slime Blast"), 1090, 25);
+    areamonster("003-1", 0, 0, 120, 155, strmobinfo(1, SlimeBlast), 1090, 25);
     areamonster("003-1", 0, 0, 120, 155, ("Black Scorpion"), BlackScorpion, 1, "Lieutenant Dausen::OnBlackScorpion2Death");
-    areamonster("003-1", 0, 0, 120, 155, ("Candied Slime"), 1089, 10, "Lieutenant Dausen::OnCandiedSlimeDeath");
-    areamonster("003-1", 0, 0, 120, 155, ("Mana Ghost"), 1068, 2, "Lieutenant Dausen::OnManaGhostDeath");
+    areamonster("003-1", 0, 0, 120, 155, strmobinfo(1, CandiedSlime), 1089, 10, "Lieutenant Dausen::OnCandiedSlimeDeath");
+    areamonster("003-1", 0, 0, 120, 155, strmobinfo(1, ManaGhost), 1068, 2, "Lieutenant Dausen::OnManaGhostDeath");
     end;
 
 OnTimer240000:
-    areamonster("003-1", 0, 0, 120, 155, ("Slime Blast"), 1090, 25);
+    areamonster("003-1", 0, 0, 120, 155, strmobinfo(1, SlimeBlast), 1090, 25);
     areamonster("003-1", 0, 0, 120, 155, ("Black Scorpion"), BlackScorpion, 1, "Lieutenant Dausen::OnBlackScorpion2Death");
-    areamonster("003-1", 0, 0, 120, 155, ("Mana Ghost"), 1068, 2, "Lieutenant Dausen::OnManaGhostDeath");
+    areamonster("003-1", 0, 0, 120, 155, strmobinfo(1, ManaGhost), 1068, 2, "Lieutenant Dausen::OnManaGhostDeath");
     end;
 
 OnTimer300000:
-    areamonster("003-1", 0, 0, 120, 155, ("Slime Blast"), 1090, 5);
-    areamonster("003-1", 0, 0, 120, 155, ("Candied Slime"), 1089, 1, "Lieutenant Dausen::OnCandiedSlimeDeath");
-    areamonster("003-1", 0, 0, 120, 155, ("Mana Ghost"), 1068, 1, "Lieutenant Dausen::OnManaGhostDeath");
+    areamonster("003-1", 0, 0, 120, 155, strmobinfo(1, SlimeBlast), 1090, 5);
+    areamonster("003-1", 0, 0, 120, 155, strmobinfo(1, CandiedSlime), 1089, 1, "Lieutenant Dausen::OnCandiedSlimeDeath");
+    areamonster("003-1", 0, 0, 120, 155, strmobinfo(1, ManaGhost), 1068, 1, "Lieutenant Dausen::OnManaGhostDeath");
     end;
 
 OnTimer360000:
 OnTimer420000:
 OnTimer480000:
-    areamonster("003-1", 0, 0, 120, 155, ("Slime Blast"), 1090, 5+$@SIEGE_TULIM);
+    areamonster("003-1", 0, 0, 120, 155, strmobinfo(1, SlimeBlast), 1090, 5+$@SIEGE_TULIM);
     areamonster("003-1", 0, 0, 120, 155, ("Red Slime"), 1092, 1+$@SIEGE_TULIM);
     end;
 
 OnTimer540000:
     mapannounce("003-1", "##1The Monster Army is getting tired of resistance!", bc_map);
-    areamonster("003-1", 0, 0, 120, 155, ("Slime Blast"), 1090, 5+$@SIEGE_TULIM);
-    areamonster("003-1", 0, 0, 120, 155, ("Mana Ghost"), 1068, 1, "Lieutenant Dausen::OnManaGhostDeath");
+    areamonster("003-1", 0, 0, 120, 155, strmobinfo(1, SlimeBlast), 1090, 5+$@SIEGE_TULIM);
+    areamonster("003-1", 0, 0, 120, 155, strmobinfo(1, ManaGhost), 1068, 1, "Lieutenant Dausen::OnManaGhostDeath");
     end;
 
 OnTimer600000: