Full npc folder reorganization. (I hope I didn't break anything D:)

-Now common scripts goes to the main npc folder, and pre-re-only/re-only ones goes to their respective folders.
-NPCs with practically the same script but little differences have been left in the main folder and uses the command checkre() for the differences.
-For those NPCs with different coordinates but same script, the script has been left in the main folder but the NPCs splitted as duplicates.
-All pre-renewal files has been reverted back to their pre-renewal behavior.

TODO:
-Correct pre-re quest rewards.
-Check for pre-re/re differences in mapflags.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16545 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 158 insertions, 132 deletions

diff --git a/npc/pre-re/mobs/fields/niflheim.txt b/npc/pre-re/mobs/fields/niflheim.txt
index 1c8c2340e..737d6aa53 100644
--- a/npc/pre-re/mobs/fields/niflheim.txt
+++ b/npc/pre-re/mobs/fields/niflheim.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.7
+//= 1.6
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
@@ -13,158 +13,184 @@
 //= 1.4a Readded Lord of Death, why was it removed anyway? [MasterOfMuppets]
 //= 1.5 Implemented the town invasion. [MasterOfMuppets]
 //= 1.6 Official kRO 10.1 spawns [Playtester]
-//= 1.7 Updated to Renewal Spawns [Kisuka]
 //============================================================
 
 //==================================================
-// niflheim - Nifflheim, Realm of the Dead
+// nif_fild01 - Skellington, a Solitary Village in Niflheim
 //==================================================
-niflheim,0,0,0,0	monster	Lude	1509,20,5000,0,0
-niflheim,0,0,0,0	monster	Quve	1508,20,5000,0,0
-niflheim,0,0,0,0	monster	Gibbet	1503,10,5000,0,0
-niflheim,0,0,0,0	monster	Heirozoist	1510,10,5000,0,0
-niflheim,0,0,0,0	monster	Dullahan	1504,5,5000,0,0
+nif_fild01,0,0,0,0	monster	Disguise	1506,20,0,0,0
+nif_fild01,0,0,0,0	monster	Disguise	1506,30,300000,120000,0
+nif_fild01,227,253,20,20	monster	Dullahan	1504,7,1800000,1200000,0
+nif_fild01,0,0,0,0	monster	Dullahan	1504,13,0,0,0
+nif_fild01,0,0,0,0	monster	Gibbet	1503,10,0,0,0
+nif_fild01,0,0,0,0	monster	Heirozoist	1510,10,0,0,0
+nif_fild01,0,0,0,0	monster	Quve	1508,30,0,0,0
 
 //==================================================
-// nif_fild01 - Skellington, a Solitary Village in Nifflheim
+// nif_fild02 - Valley of Gyoll
 //==================================================
-nif_fild01,0,0,0,0	monster	Disguise	1506,50,5000,0,0
-nif_fild01,0,0,0,0	monster	Quve	1508,30,5000,0,0
-nif_fild01,0,0,0,0	monster	Dullahan	1504,20,5000,0,0
-nif_fild01,0,0,0,0	monster	Gibbet	1503,10,5000,0,0
-nif_fild01,0,0,0,0	monster	Heirozoist	1510,10,5000,0,0
+nif_fild02,366,236,15,15	monster	Lude	1509,10,360000,150000,0
+nif_fild02,356,139,10,10	monster	Bloody Murderer	1507,1,1200000,600000,0
+nif_fild02,144,232,10,10	monster	Bloody Murderer	1507,1,1200000,600000,0
+nif_fild02,118,282,15,15	monster	Bloody Murderer	1507,1,1200000,600000,0
+nif_fild02,62,327,15,15	monster	Bloody Murderer	1507,1,1200000,600000,0
+nif_fild02,0,0,0,0	monster	Bloody Murderer	1507,7,0,0,0
+nif_fild02,114,136,15,15	monster	Loli Ruri	1505,2,1200000,600000,0
+nif_fild02,52,115,10,10	monster	Heirozoist	1510,4,1200000,600000,0
+nif_fild02,84,276,15,15	monster	Gibbet	1503,5,1200000,600000,0
+nif_fild02,352,273,15,15	monster	Gibbet	1503,5,300000,150000,0
+nif_fild02,0,0,0,0	monster	Loli Ruri	1505,19,120000,60000,0
+nif_fild02,352,273,15,15	monster	Dullahan	1504,5,600000,300000,0
+nif_fild02,0,0,0,0	monster	Dullahan	1504,5,0,0,0
+nif_fild02,0,0,0,0	monster	Heirozoist	1510,6,0,0,0
+nif_fild02,0,0,0,0	monster	Gibbet	1503,10,0,0,0
 
 //==================================================
-// nif_fild02 - Vally of Gyoll
+// niflheim - Niflheim, Realm of the Dead
 //==================================================
-nif_fild02,0,0,0,0	monster	Loli Ruri	1505,21,5000,0,0
-nif_fild02,0,0,0,0	monster	Gibbet	1503,20,5000,0,0
-nif_fild02,0,0,0,0	monster	Bloody Murderer	1507,11,5000,0,0
-nif_fild02,0,0,0,0	monster	Dullahan	1504,10,5000,0,0
-nif_fild02,0,0,0,0	monster	Lude	1509,10,5000,0,0
-nif_fild02,0,0,0,0	monster	Heirozoist	1510,10,5000,0,0
-
-niflheim,0,0,0	script	mvp_niflheim	-1,{
-OnTimer7980000: // delay1 = 7980000 ms (133 min)
-	stopnpctimer;
+niflheim,0,0,0,0	monster	Dullahan	1504,5,1800000,1200000,0
+niflheim,0,0,0,0	monster	Gibbet	1503,10,1200000,600000,0
+niflheim,0,0,0,0	monster	Heirozoist	1510,10,1200000,600000,0
+niflheim,0,0,0,0	monster	Quve	1508,20,300000,150000,0
+niflheim,0,0,0,0	monster	Lude	1509,20,300000,150000,0
+
+niflheim,1,1,0	script	NifInvasion	-1,{
 OnInit:
-	switch(rand(6)) {
+
+	while(1)
+	{
+	initnpctimer;
+	end;
+
+OnTimer7980000:
+	stopnpctimer;
+    	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";
-		break;
+		monster "niflheim",327,193,"Lord Of Death",1373,1,"NifInvasion::OnLoDDead";
+		monster "niflheim",330,193,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",324,193,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",327,196,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",327,190,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",324,190,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",330,190,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",324,196,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",330,196,"Loli Ruri",1505,1,"NifInvasion::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";
-		break;
+		monster "niflheim",337,252,"Lord Of Death",1373,1,"NifInvasion::OnLoDDead";
+		monster "niflheim",337,255,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",337,249,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",334,252,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",340,252,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",334,249,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",340,255,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",340,249,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",334,255,"Loli Ruri",1505,1,"NifInvasion::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";
-		break;
+		monster "niflheim",190,185,"Lord Of Death",1373,1,"NifInvasion::OnLoDDead";
+		monster "niflheim",190,188,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",190,182,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",193,185,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",187,185,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",187,182,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",193,182,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",193,188,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",187,188,"Loli Ruri",1505,1,"NifInvasion::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";
-		break;
+		monster "niflheim",131,138,"Lord Of Death",1373,1,"NifInvasion::OnLoDDead";
+		monster "niflheim",131,141,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",131,135,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",128,138,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",134,138,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",134,141,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",128,141,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",134,135,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",128,135,"Loli Ruri",1505,1,"NifInvasion::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";
-		break;
+		monster "niflheim",311,64,"Lord Of Death",1373,1,"NifInvasion::OnLoDDead";
+		monster "niflheim",311,67,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",311,61,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",308,64,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",314,64,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",314,61,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",314,67,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",308,67,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",308,61,"Loli Ruri",1505,1,"NifInvasion::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";
-		break;
+		monster "niflheim",238,131,"Lord Of Death",1373,1,"NifInvasion::OnLoDDead";
+		monster "niflheim",238,134,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",238,128,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",235,131,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",241,131,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",235,128,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",235,134,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",241,128,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",241,134,"Loli Ruri",1505,1,"NifInvasion::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";
-		break;
+		monster "niflheim",86,219,"Lord Of Death",1373,1,"NifInvasion::OnLoDDead";
+		monster "niflheim",86,222,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",86,216,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",89,219,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",83,219,"Bloody Murderer",1507,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",89,222,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",89,216,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",83,222,"Loli Ruri",1505,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",83,216,"Loli Ruri",1505,1,"NifInvasion::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,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",115,65,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",330,195,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",151,83,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",285,245,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",235,135,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",265,48,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",186,139,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",166,267,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",82,202,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",219,44,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",287,44,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",275,165,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",138,204,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",299,39,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",31,154,"Disguise",1506,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",154,96,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",116,65,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",151,84,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",286,245,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",330,196,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",236,135,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",165,49,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",167,267,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",82,203,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",220,44,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",287,45,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",287,44,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",276,166,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",139,205,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",300,39,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
+		monster "niflheim",31,155,"Dullahan",1504,1,"NifInvasion::OnInvasionMonsters";
 	end;
 
-OnLoDDead:
-	killmonster "niflheim",strnpcinfo(3)+"::OnInvasionMonsters";
-	initnpctimer;
 OnInvasionMonsters:
 	end;
+
+OnLoDDead:
+	killmonster "niflheim","NifInvasion::OnInvasionMonsters";
+	}
+
 }