*strnpcinfo now uses constants

- NPC_NAME for the whole npc name including hidden part
- NPC_NAME_VISIBLE for the visible part of the npc name
- NPC_NAME_HIDDEN for the hidden part of the npc name
- NPC_NAME_UNIQUE for the npc unique name
- NPC_MAP for npc map

2 files changed, 102 insertions, 102 deletions

diff --git a/npc/re/mobs/dungeons/lhz_dun.txt b/npc/re/mobs/dungeons/lhz_dun.txt
index 7ec6e6c49..3243a6e04 100644
--- a/npc/re/mobs/dungeons/lhz_dun.txt
+++ b/npc/re/mobs/dungeons/lhz_dun.txt
@@ -94,7 +94,7 @@ OnInit:
 		case 6:  .@x = 175;  .@y = 137;  break;
 	}
 	.@mob = rand(1646,1651);
-	monster "lhz_dun03",.@x,.@y,strmobinfo(1,.@mob),.@mob,1,strnpcinfo(3)+"::OnMyMVPDead";
+	monster "lhz_dun03",.@x,.@y,strmobinfo(1,.@mob),.@mob,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnMyMVPDead";
 
 	// Select Coordinates to summon a random 99 on
 	switch(rand(1,6)) {
@@ -106,11 +106,11 @@ OnInit:
 		case 6:  .@x2 = 139;  .@y2 = 259;  break;
 	}
 	.@mob2 = rand(1640,1645);
-	monster "lhz_dun03",.@x2,.@y2,strmobinfo(1,.@mob2),.@mob2,1,strnpcinfo(3)+"::OnMy99Dead";
+	monster "lhz_dun03",.@x2,.@y2,strmobinfo(1,.@mob2),.@mob2,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnMy99Dead";
 	end;
 
 OnMyMVPDead:
-	killmonster "lhz_dun03",strnpcinfo(3)+"::OnMy99Dead";
+	killmonster "lhz_dun03",strnpcinfo(NPC_NAME_UNIQUE)+"::OnMy99Dead";
 	initnpctimer;
 OnMy99Dead:
 	end;
@@ -148,7 +148,7 @@ OnInit:
 		case 7:  .@x = 149;  .@y = 151;  break;
 	}
 	.@mob = rand(2235,2241);
-	monster "lhz_dun04",.@x,.@y,strmobinfo(1,.@mob),.@mob,1,strnpcinfo(3)+"::OnMyMVPDead";
+	monster "lhz_dun04",.@x,.@y,strmobinfo(1,.@mob),.@mob,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnMyMVPDead";
 
 	// Select Coordinates to summon a random 99 on
 	switch(rand(1,7)) {
@@ -161,11 +161,11 @@ OnInit:
 		case 7:  .@x2 = 149;  .@y2 = 151;  break;
 	}
 	.@mob2 = rand(2228,2234);
-	monster "lhz_dun04",.@x2,.@y2,strmobinfo(1,.@mob2),.@mob2,1,strnpcinfo(3)+"::OnMy99Dead";
+	monster "lhz_dun04",.@x2,.@y2,strmobinfo(1,.@mob2),.@mob2,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnMy99Dead";
 	end;
 
 OnMyMVPDead:
-	killmonster "lhz_dun04",strnpcinfo(3)+"::OnMy99Dead";
+	killmonster "lhz_dun04",strnpcinfo(NPC_NAME_UNIQUE)+"::OnMy99Dead";
 	initnpctimer;
 OnMy99Dead:
 	end;
diff --git a/npc/re/mobs/fields/niflheim.txt b/npc/re/mobs/fields/niflheim.txt
index d47248a8c..c42aba3d9 100644
--- a/npc/re/mobs/fields/niflheim.txt
+++ b/npc/re/mobs/fields/niflheim.txt
@@ -66,120 +66,120 @@ OnTimer7980000: // delay1 = 7980000 ms (133 min)
 OnInit:
 	switch(rand(6)) {
 	case 0:
-		monster "niflheim",327,193,"Lord Of Death",1373,1,strnpcinfo(3)+"::OnLoDDead";
-		monster "niflheim",330,193,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",324,193,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",327,196,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",327,190,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",324,190,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",330,190,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",324,196,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",330,196,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters";
+		monster "niflheim",327,193,"Lord Of Death",1373,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnLoDDead";
+		monster "niflheim",330,193,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",324,193,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",327,196,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",327,190,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",324,190,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",330,190,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",324,196,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",330,196,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
 		break;
 	case 1:
-		monster "niflheim",337,252,"Lord Of Death",1373,1,strnpcinfo(3)+"::OnLoDDead";
-		monster "niflheim",337,255,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",337,249,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",334,252,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",340,252,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",334,249,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",340,255,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",340,249,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",334,255,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters";
+		monster "niflheim",337,252,"Lord Of Death",1373,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnLoDDead";
+		monster "niflheim",337,255,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",337,249,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",334,252,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",340,252,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",334,249,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",340,255,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",340,249,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",334,255,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
 		break;
 	case 2:
-		monster "niflheim",190,185,"Lord Of Death",1373,1,strnpcinfo(3)+"::OnLoDDead";
-		monster "niflheim",190,188,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",190,182,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",193,185,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",187,185,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",187,182,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",193,182,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",193,188,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",187,188,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters";
+		monster "niflheim",190,185,"Lord Of Death",1373,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnLoDDead";
+		monster "niflheim",190,188,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",190,182,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",193,185,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",187,185,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",187,182,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",193,182,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",193,188,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",187,188,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
 		break;
 	case 3:
-		monster "niflheim",131,138,"Lord Of Death",1373,1,strnpcinfo(3)+"::OnLoDDead";
-		monster "niflheim",131,141,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",131,135,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",128,138,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",134,138,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",134,141,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",128,141,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",134,135,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",128,135,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters";
+		monster "niflheim",131,138,"Lord Of Death",1373,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnLoDDead";
+		monster "niflheim",131,141,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",131,135,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",128,138,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",134,138,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",134,141,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",128,141,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",134,135,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",128,135,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
 		break;
 	case 4:
-		monster "niflheim",311,64,"Lord Of Death",1373,1,strnpcinfo(3)+"::OnLoDDead";
-		monster "niflheim",311,67,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",311,61,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",308,64,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",314,64,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",314,61,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",314,67,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",308,67,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",308,61,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters";
+		monster "niflheim",311,64,"Lord Of Death",1373,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnLoDDead";
+		monster "niflheim",311,67,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",311,61,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",308,64,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",314,64,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",314,61,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",314,67,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",308,67,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",308,61,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
 		break;
 	case 5:
-		monster "niflheim",238,131,"Lord Of Death",1373,1,strnpcinfo(3)+"::OnLoDDead";
-		monster "niflheim",238,134,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",238,128,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",235,131,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",241,131,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",235,128,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",235,134,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",241,128,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",241,134,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters";
+		monster "niflheim",238,131,"Lord Of Death",1373,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnLoDDead";
+		monster "niflheim",238,134,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",238,128,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",235,131,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",241,131,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",235,128,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",235,134,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",241,128,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",241,134,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
 		break;
 	case 6:
-		monster "niflheim",86,219,"Lord Of Death",1373,1,strnpcinfo(3)+"::OnLoDDead";
-		monster "niflheim",86,222,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",86,216,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",89,219,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",83,219,"Bloody Murderer",1507,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",89,222,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",89,216,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",83,222,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters";
-		monster "niflheim",83,216,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters";
+		monster "niflheim",86,219,"Lord Of Death",1373,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnLoDDead";
+		monster "niflheim",86,222,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",86,216,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",89,219,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",83,219,"Bloody Murderer",1507,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",89,222,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",89,216,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",83,222,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+		monster "niflheim",83,216,"Loli Ruri",1505,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
 		break;
 	}
 
-	monster "niflheim",154,95,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",115,65,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",330,195,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",151,83,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",285,245,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",235,135,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",265,48,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",186,139,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",166,267,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",82,202,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",219,44,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",287,44,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",275,165,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",138,204,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",299,39,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",31,154,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",154,96,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",116,65,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",151,84,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",286,245,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",330,196,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",236,135,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",165,49,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",167,267,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",82,203,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",220,44,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",287,45,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",287,44,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",276,166,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",139,205,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",300,39,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters";
-	monster "niflheim",31,155,"Dullahan",1504,1,strnpcinfo(3)+"::OnInvasionMonsters";
+	monster "niflheim",154,95,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",115,65,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",330,195,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",151,83,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",285,245,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",235,135,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",265,48,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",186,139,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",166,267,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",82,202,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",219,44,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",287,44,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",275,165,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",138,204,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",299,39,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",31,154,"Disguise",1506,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",154,96,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",116,65,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",151,84,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",286,245,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",330,196,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",236,135,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",165,49,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",167,267,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",82,203,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",220,44,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",287,45,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",287,44,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",276,166,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",139,205,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",300,39,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
+	monster "niflheim",31,155,"Dullahan",1504,1,strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
 	end;
 
 OnLoDDead:
-	killmonster "niflheim",strnpcinfo(3)+"::OnInvasionMonsters";
+	killmonster "niflheim",strnpcinfo(NPC_NAME_UNIQUE)+"::OnInvasionMonsters";
 	initnpctimer;
 OnInvasionMonsters:
 	end;