Update legacy code

1 files changed, 34 insertions, 34 deletions

diff --git a/npc/001-1/eventmaster.txt b/npc/001-1/eventmaster.txt
index 324d0a87b..31b5edf7c 100644
--- a/npc/001-1/eventmaster.txt
+++ b/npc/001-1/eventmaster.txt
@@ -73,76 +73,76 @@ L_Preset:
         case 1:
             break;
         case 2:
-            spawner(l("Piou"), 1002, 20);
-            spawner(l("Piousee"), 1003, 20);
-            spawner(l("Ratto"), 1005, 20);
-            spawner(l("Croc"), 1006, 10);
+            spawner(strmobinfo(1, Piou), Piou, 20);
+            spawner(strmobinfo(1, Piousee), Piousee, 20);
+            spawner(strmobinfo(1, Ratto), Ratto, 20);
+            spawner(strmobinfo(1, Croc), Croc, 10);
             @log_spawns=@log_spawns+70;
             break;
         case 3:
-            spawner(l("Little Blub"), 1007, 20);
-            spawner(l("Plushroom Field"), 1011, 10);
+            spawner(strmobinfo(1, LittleBlub), LittleBlub, 20);
+            spawner(strmobinfo(1, PlushroomField), PlushroomField, 10);
             @log_spawns=@log_spawns+30;
             break;
         case 4:
-            spawner(l("Tipiu"), 1015, 5);
-            spawner(l("Cave Maggot"), 1027, 10);
-            spawner(l("Bat"), 1039, 10);
+            spawner(strmobinfo(1, Tipiu), Tipiu, 5);
+            spawner(strmobinfo(1, CaveMaggot), CaveMaggot, 10);
+            spawner(strmobinfo(1, Bat), Bat, 10);
             @log_spawns=@log_spawns+25;
             break;
         case 5:
-            spawner(l("Scorpion"), 1071, 20);
-            spawner(l("Duck"), 1029, 10);
-            spawner(l("Maggot"), 1030, 10);
+            spawner(strmobinfo(1, Scorpion), Scorpion, 20);
+            spawner(strmobinfo(1, Duck), Duck, 10);
+            spawner(strmobinfo(1, Maggot), Maggot, 10);
             @log_spawns=@log_spawns+40;
             break;
         case 6:
-            spawner(l("Red Scorpion"), 1002, 10);
-            spawner(l("Fire Goblin"), 1067, 20);
-            spawner(l("Mana Ghost"), 1068, 5);
+            spawner(strmobinfo(1, RedScorpion), RedScorpion, 10);
+            spawner(strmobinfo(1, ManaBug), FireGoblin, 20);
+            spawner(strmobinfo(1, ManaGhost), ManaGhost, 5);
             @log_spawns=@log_spawns+35;
             break;
         case 7:
-            spawner(l("Saxso Ghost"), 1076, 1);
-            spawner(l("House Maggot"), 1084, 20);
+            spawner(strmobinfo(1, SaxsoGhost), SaxsoGhost, 1);
+            spawner(strmobinfo(1, HouseMaggot), HouseMaggot, 20);
             @log_spawns=@log_spawns+21;
             break;
         case 8:
-            spawner(l("Slime Blast"), 1090, 5);
-            spawner(l("Red Slime"), 1092, 5);
-            spawner(l("White Slime"), 1094, 10);
+            spawner(strmobinfo(1, SlimeBlast), SlimeBlast, 5);
+            spawner(strmobinfo(1, RedSlime), RedSlime, 5);
+            spawner(strmobinfo(1, WhiteSlime), WhiteSlime, 10);
             @log_spawns=@log_spawns+20;
             break;
 
         case 9:
-            spawner(l("Mouboo"), 1023, 5);
-            spawner(l("Bandit"), 1024, 4);
-            spawner(l("Black Scorpion"), 1074, 2);
+            spawner(strmobinfo(1, Mouboo), Mouboo, 5);
+            spawner(strmobinfo(1, Bandit), Bandit, 4);
+            spawner(strmobinfo(1, BlackScorpion), BlackScorpion, 2);
             @log_spawns=@log_spawns+11;
             break;
         case 10:
-            spawner(l("Giant Maggot"), 1031, 10);
-            spawner(l("Cave Snake"), 1035, 10);
-            spawner(l("Mana Bug"), 1075, 10);
+            spawner(strmobinfo(1, GiantMaggot), GiantMaggot, 10);
+            spawner(strmobinfo(1, CaveSnake), CaveSnake, 10);
+            spawner(strmobinfo(1, ManaBug), ManaBug, 10);
             @log_spawns=@log_spawns+30;
             break;
         case 11:
-            spawner(l("Golden Scorpion"), 1078, 1);
-            spawner(l("Night Scorpion"), 1077, 1);
-            spawner(l("Santa Slime"), 1096, 5);
-            spawner(l("Copper Slime"), 1088, 10);
+            spawner(strmobinfo(1, GoldenScorpion), GoldenScorpion, 1);
+            spawner(strmobinfo(1, NightScorpion), NightScorpion, 1);
+            spawner(strmobinfo(1, SantaSlime), SantaSlime, 5);
+            spawner(strmobinfo(1, CopperSlime), CopperSlime, 10);
             @log_spawns=@log_spawns+17;
             break;
         case 12:
-            spawner(l("Frostia Guard"), 1081, 1);
-            spawner(l("Halinarzo Guard"), 1082, 1);
+            spawner(strmobinfo(1, FallenGuard1), FallenGuard1, 1);
+            spawner(strmobinfo(1, FallenGuard2), FallenGuard2, 1);
             @log_spawns=@log_spawns+2;
             break;
 
         //"10x Clover Path, 5 groups of 5 random Bifs",                   // 13
         //"5x Bifs, 4 groups of 5 random Bifs";                           // 14
         case 13:
-            spawner(l("Clover Field"), 1028, 10);
+            spawner(strmobinfo(1, CloverPatch), CloverPatch, 10);
             spawner(l("Mysterious Bif"), rand(1098,1118), 5);
             spawner(l("Mysterious Bif"), rand(1098,1118), 5);
             spawner(l("Mysterious Bif"), rand(1098,1118), 5);
@@ -151,7 +151,7 @@ L_Preset:
             @log_spawns=@log_spawns+35;
             break;
         case 14:
-            spawner(l("Bif"), 1058, 5);
+            spawner(strmobinfo(1, Bif), Bif, 5);
             spawner(l("Mysterious Bif"), rand(1098,1118), 5);
             spawner(l("Mysterious Bif"), rand(1098,1118), 5);
             spawner(l("Mysterious Bif"), rand(1098,1118), 5);