don't use custom mob names when not necessary

13 files changed, 22 insertions, 23 deletions

diff --git a/client-data b/client-data
-Subproject da61a45e3da185ce8e026e1c1ef2421e614add8
+Subproject c35ce1e64f90589afb8683b9511e7d156352f02
diff --git a/tools b/tools
-Subproject 6d424594e01d129f3c219190310a9535032ab59
+Subproject 4f3c38251baf10e1ed36ac487c8f26c0021e4e6
diff --git a/world/map/npc/001-2/pauline.txt b/world/map/npc/001-2/pauline.txt
index 6925d554..37cce863 100644
--- a/world/map/npc/001-2/pauline.txt
+++ b/world/map/npc/001-2/pauline.txt
@@ -175,7 +175,7 @@ L_Pass2Mouboo:
 
 L_TrySpellMouboo:
     mes "The Witch takes " + @pauline_ingredient1$ + " and " + @pauline_ingredient2$ + " and puts them together calling " + get(.invocation$, "summon-mouboo") + ".";
-    monster "001-1", 55,68, "Good", 1028, 1;
+    monster "001-1", 55,68, "", 1028, 1;
     mes "[Pauline]";
     mes "\"It worked!\"";
     set @pauline_state, 3;
@@ -238,7 +238,7 @@ L_Pass2Pinkie:
 
 L_TrySpellPinkie:
     mes "The Witch takes " + @pauline_ingredient1$ + " and " + @pauline_ingredient2$ + " and puts them together calling " + get(.invocation$, "summon-pinkie") + ".";
-    monster "001-1", 54,68, "Good", 1018, 1;
+    monster "001-1", 54,68, "", 1018, 1;
     mes "[Pauline]";
     mes "\"It worked!\"";
     set @pauline_state, 4;
diff --git a/world/map/npc/008-1/andra.txt b/world/map/npc/008-1/andra.txt
index 3bd79058..68796fd7 100644
--- a/world/map/npc/008-1/andra.txt
+++ b/world/map/npc/008-1/andra.txt
@@ -68,7 +68,7 @@ L_PreSummon:
 
 OnTimer1000:
     set $@plant_id, rand(1029,1032);
-    areamonster "008-1",44,18,135,46,"plant",$@plant_id,$@PLANTS_PER_SEED, "Andra::OnPlantDeath";
+    areamonster "008-1",44,18,135,46,"",$@plant_id,$@PLANTS_PER_SEED, "Andra::OnPlantDeath";
     if (attachrid(getcharid(3,$@farmer$)) == 0)
         goto L_Spawn1000;
     message strcharinfo(0), "Andra: I think some plants will grow almost instantly! Just Watch...";
@@ -80,19 +80,19 @@ L_Spawn1000:
 
 OnTimer3000:
     set $@plant_id, rand(1029,1032);
-    areamonster "008-1",44,18,135,46,"plant",$@plant_id,$@PLANTS_PER_SEED, "Andra::OnPlantDeath";
+    areamonster "008-1",44,18,135,46,"",$@plant_id,$@PLANTS_PER_SEED, "Andra::OnPlantDeath";
     set $@spawned_plants, $@spawned_plants + $@PLANTS_PER_SEED;
     end;
 
 OnTimer5000:
     set $@plant_id, rand(1029,1032);
-    areamonster "008-1",44,18,135,46,"plant",$@plant_id,$@PLANTS_PER_SEED, "Andra::OnPlantDeath";
+    areamonster "008-1",44,18,135,46,"",$@plant_id,$@PLANTS_PER_SEED, "Andra::OnPlantDeath";
     set $@spawned_plants, $@spawned_plants + $@PLANTS_PER_SEED;
     end;
 
 OnTimer7000:
     set $@plant_id, rand(1029,1032);
-    areamonster "008-1",44,18,135,46,"plant",$@plant_id,$@PLANTS_PER_SEED, "Andra::OnPlantDeath";
+    areamonster "008-1",44,18,135,46,"",$@plant_id,$@PLANTS_PER_SEED, "Andra::OnPlantDeath";
     if (attachrid(getcharid(3,$@farmer$)) == 0)
         goto L_Spawn7000;
     message strcharinfo(0), "Andra: Good... Just take a walk and you will be able to see how your seeds turned into some nice looking plants.";
diff --git a/world/map/npc/009-2/lena.txt b/world/map/npc/009-2/lena.txt
index 6f22030a..27a88310 100644
--- a/world/map/npc/009-2/lena.txt
+++ b/world/map/npc/009-2/lena.txt
@@ -31,8 +31,8 @@ L_Lena_Approves:
     callsub S_Update_Var;
     mes "[Lena]";
     mes "\"You look like you can handle yourself in a fight. If you can take on this scourge I'll reward you with a hat like mine. In order to prove your mettle, bring me 10 Bandit Hoods so I know they've met their match.\"";
-    areamonster "008-1",25,60,40,65,"Bandit",1064,3, "::";
-    areamonster "011-1",35,40,65,60,"Bandit",1064,3, "::";
+    areamonster "008-1",25,60,40,65,"",1064,3;
+    areamonster "011-1",35,40,65,60,"",1064,3;
     goto L_Close;
 
 L_Lena_No_Fan:
@@ -73,8 +73,8 @@ L_Lena_Bandit_Leader:
 L_LBL_Yes:
     set @state, 3;
     callsub S_Update_Var;
-    areamonster "008-1",25,60,40,65,"Bandit",1064,3, "::";
-    areamonster "011-1",35,40,65,60,"Bandit",1064,3, "::";
+    areamonster "008-1",25,60,40,65,"",1064,3;
+    areamonster "011-1",35,40,65,60,"",1064,3;
     mes "[Lena]";
     mes "\"You have a brave heart. Though I know you can succeed on your own, I recommend finding others to help you defeat the bandit leader. I believe he could pose a significant threat to solitary individuals seeking to challenge him. Good luck!\"";
     goto L_Close;
diff --git a/world/map/npc/009-4/waric.txt b/world/map/npc/009-4/waric.txt
index 9598ecaa..aa366318 100644
--- a/world/map/npc/009-4/waric.txt
+++ b/world/map/npc/009-4/waric.txt
@@ -88,7 +88,7 @@ L_Explain:
     warp "008-1", 65, 90;
     getexp @EXP_LEARNED_ALOT, 0;
     mes "You awake on your back with a squirrel sitting on top of you arranging it's acorns. It quickly gathers them up and runs off as it sees you looking at it them.";
-    monster "008-1", 65, 90, "Squirrel", 1038, 1;
+    monster "008-1", 65, 90, "", 1038, 1;
     goto L_Close;
 
 L_Close:
diff --git a/world/map/npc/011-1/auldsbel.txt b/world/map/npc/011-1/auldsbel.txt
index f4c328ce..d42b4492 100644
--- a/world/map/npc/011-1/auldsbel.txt
+++ b/world/map/npc/011-1/auldsbel.txt
@@ -943,7 +943,7 @@ L_Next8:
     mes "\"I suggest that you run.\"";
     next;
     misceffect sfx_magic_transmute;
-    monster "this", 50, 68, "Grass Snake", 1034, 4, "Auldsbel#_M::OnSnakeDeath";
+    monster "this", 50, 68, "", 1034, 4, "Auldsbel#_M::OnSnakeDeath";
     close;
 
 OnSnakeDeath:
diff --git a/world/map/npc/011-6/bryant.txt b/world/map/npc/011-6/bryant.txt
index 9969b767..552d0907 100644
--- a/world/map/npc/011-6/bryant.txt
+++ b/world/map/npc/011-6/bryant.txt
@@ -22,7 +22,7 @@ L_Bryant_Summon:
     mes "\"I believe I saw him run into a cave south and east of here. There is a red carpet in front of the cave entrance. Be careful and good luck.\"";
     set @state, 4;
     callsub S_Update_Var;
-    monster "011-6",260,250,"BanditLord",1065,1, "Bryant::OnBanditLordDead";
+    monster "011-6",260,250,"",1065,1, "Bryant::OnBanditLordDead";
     goto L_Close;
 
 OnBanditLordDead:
@@ -51,14 +51,14 @@ L_Bryant_No:
     mes "[Bryant]";
     mes "\"Well, maybe he ran off. I'm pretty sure he should be there now.\"";
     killmonster "011-6", "Bryant::OnBanditLordDead";
-    monster "011-6",260,250,"BanditLord",1065,1, "Bryant::OnBanditLordDead";
+    monster "011-6",260,250,"",1065,1, "Bryant::OnBanditLordDead";
     goto L_Close;
 
 L_Bryant_Yes:
     mes "[Bryant]";
     mes "\"I don't think you killed him. Please try to find and kill him. He should be in the cave south and east of here with the red carpet in front of it.\"";
     killmonster "011-6", "Bryant::OnBanditLordDead";
-    monster "011-6",260,250,"BanditLord",1065,1, "Bryant::OnBanditLordDead";
+    monster "011-6",260,250,"",1065,1, "Bryant::OnBanditLordDead";
     goto L_Close;
 
 L_Bryant_Quiet:
diff --git a/world/map/npc/017-4/waric.txt b/world/map/npc/017-4/waric.txt
index a0f826e9..7a8c4e68 100644
--- a/world/map/npc/017-4/waric.txt
+++ b/world/map/npc/017-4/waric.txt
@@ -298,7 +298,7 @@ L_Next6:
     next;
     mes "The Egg cracks open and a living snake comes out of the egg.";
     next;
-    monster "017-4", 217,36, "Evil", 1010, 1;
+    monster "017-4", 217,36, "", 1010, 1;
     mes "The wizard looks at you, his eyes flashing, and laughs diabolically.";
     set OrumQuest, 40;
     goto L_Close;
diff --git a/world/map/npc/029-1/hasan.txt b/world/map/npc/029-1/hasan.txt
index 626c5570..724db18c 100644
--- a/world/map/npc/029-1/hasan.txt
+++ b/world/map/npc/029-1/hasan.txt
@@ -158,7 +158,7 @@ OnCommandHasanSpawn:
     goto L_Summon;
 
 L_Summon:
-    monster "029-1",33,33,"WeakScorpion",1046,1, "#ScorpionTrigger::OnScorpionDeath";
+    monster "029-1",33,33,"",1046,1, "#ScorpionTrigger::OnScorpionDeath";
     initnpctimer;
     end;
 
diff --git a/world/map/npc/029-2/barrels_config.txt b/world/map/npc/029-2/barrels_config.txt
index 8ad1cfd5..9fe9de71 100644
--- a/world/map/npc/029-2/barrels_config.txt
+++ b/world/map/npc/029-2/barrels_config.txt
@@ -10,7 +10,6 @@ OnInit:
     setarray $@BarrelRewards, 533, 507, 505, 518, 537, 526;
     set $@BarrelSpawnCnt, 1;
     set $@BarrelSpawnId, 1050;
-    set $@BarrelSpawnName$, "House Maggot";
     set $@BarrelMax, getarraysize($@BarrelBits);
     end;
 }
@@ -76,7 +75,7 @@ L_QuestReward:
 L_Spawn:
     message strcharinfo(0), "Uck, More Maggots!";
     setarray @npc_loc, getnpcx(), getnpcy();
-    areamonster getmap(), @npc_loc[0], @npc_loc[1], (@npc_loc[0] + 1), (@npc_loc[1] + 1), $@BarrelSpawnName$, $@BarrelSpawnId, $@BarrelSpawnCnt, "Barrel#0::OnMaggotDeath";
+    areamonster getmap(), @npc_loc[0], @npc_loc[1], (@npc_loc[0] + 1), (@npc_loc[1] + 1), "", $@BarrelSpawnId, $@BarrelSpawnCnt, "Barrel#0::OnMaggotDeath";
     cleararray @npc_loc, 0, 2;
     goto L_Return;
 
diff --git a/world/map/npc/annuals/xmas/config.txt b/world/map/npc/annuals/xmas/config.txt
index d3c51664..31068889 100644
--- a/world/map/npc/annuals/xmas/config.txt
+++ b/world/map/npc/annuals/xmas/config.txt
@@ -245,14 +245,14 @@ L_Main:
     set $@xmas_required_helpers_count, (getarraysize($@xmas_helper_list) / 2);
 
     // MobManager
-    setarray $@xmas_mob_names$, "Santa Slime", "Candied Slime", "Candied Slime";
+    //setarray $@xmas_mob_names$, "Santa Slime", "Candied Slime", "Candied Slime";
     setarray $@xmas_mob_spawns, "1015", "1111", "1111";
     setarray $@xmas_mob_counts, 10, 5, 5;
     setarray $@xmas_map_spawns$, "019-1", "019-3", "030-3";
     if(getarraysize($@xmas_mob_spawns) != getarraysize($@xmas_map_spawns$))
         goto L_XmasError;
-    if(getarraysize($@xmas_mob_names$) != getarraysize($@xmas_map_spawns$))
-        goto L_XmasError;
+    //if(getarraysize($@xmas_mob_names$) != getarraysize($@xmas_map_spawns$))
+    //    goto L_XmasError;
     if(getarraysize($@xmas_mob_counts) != getarraysize($@xmas_map_spawns$))
         goto L_XmasError;
 
diff --git a/world/map/npc/functions/evil_obelisk.txt b/world/map/npc/functions/evil_obelisk.txt
index 5ea50a3b..dbfede0d 100644
--- a/world/map/npc/functions/evil_obelisk.txt
+++ b/world/map/npc/functions/evil_obelisk.txt
@@ -79,7 +79,7 @@ L_SNAKE:
     goto L_Summon;
 
 L_Summon:
-    areamonster @map$, @x0, @y0, @x1, @y1, "Evil", @mob_id, @mob_count;
+    areamonster @map$, @x0, @y0, @x1, @y1, "", @mob_id, @mob_count;
     goto L_Close;
 
 L_NotEnough: