Added ability to use constants instead of sprite IDs for NPCs. Converted all npcs to use this.

1 files changed, 99 insertions, 99 deletions

diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt
index 8fb99978f..1e005e43b 100644
--- a/npc/re/instances/OldGlastHeim.txt
+++ b/npc/re/instances/OldGlastHeim.txt
@@ -14,7 +14,7 @@
 1@gl_k	mapflag	src4instance
 2@gl_k	mapflag	src4instance
 //============================================================
-glast_01,204,273,6	script	Hugin#ghinstance	755,{
+glast_01,204,273,6	script	Hugin#ghinstance	4_M_SAGE_C,{
 	mes "^ff0000This isn't considered a normal progression dungeon. Please note this point.^000000";
 	next;
 	mes "[Hugin]";
@@ -91,7 +91,7 @@ glast_01,204,273,6	script	Hugin#ghinstance	755,{
 
 // Floor 1
 //============================================================
-1@gl_k,149,41,6	script	Varmunt#ghinstance1	654,{
+1@gl_k,149,41,6	script	Varmunt#ghinstance1	4_M_BARMUND,{
 	if (getcharid(0) == getpartyleader(getcharid(1),2)) {
 		mes "Hey ^0000ffguys^000000, were you sent here to help me?";
 		npctalk "Hey guys, were you sent here to help me?";
@@ -168,7 +168,7 @@ OnEnable:
 	end;
 }
 
-1@gl_k,145,54,6	script	Khalitzburg Crusader#1	655,{
+1@gl_k,145,54,6	script	Khalitzburg Crusader#1	4_F_KHALITZBURG,{
 	mes "["+strnpcinfo(1)+"]";
 	switch((atoi(strnpcinfo(2)) + 1) / 2) {
 		case 1: mes "Would I be recruited?"; break;
@@ -194,29 +194,29 @@ OnEnable:
 	hideoffnpc instance_npcname(strnpcinfo(0));
 	end;
 }
-1@gl_k,154,54,3	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#2	655
-1@gl_k,145,59,6	duplicate(Khalitzburg Crusader#1)	White Knight#3	657
-1@gl_k,154,59,3	duplicate(Khalitzburg Crusader#1)	White Knight#4	657
-1@gl_k,145,64,6	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#5	655
-1@gl_k,154,64,3	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#6	655
-1@gl_k,145,69,6	duplicate(Khalitzburg Crusader#1)	White Knight#7	657
-1@gl_k,154,69,3	duplicate(Khalitzburg Crusader#1)	White Knight#8	657
-1@gl_k,145,74,6	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#9	655
-1@gl_k,154,74,3	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#10	655
-1@gl_k,145,79,6	duplicate(Khalitzburg Crusader#1)	White Knight#11	657
-1@gl_k,154,79,3	duplicate(Khalitzburg Crusader#1)	White Knight#12	657
-1@gl_k,145,84,6	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#13	655
-1@gl_k,154,84,3	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#14	655
-1@gl_k,145,89,6	duplicate(Khalitzburg Crusader#1)	White Knight#15	657
-1@gl_k,154,89,3	duplicate(Khalitzburg Crusader#1)	White Knight#16	657
-1@gl_k,145,94,6	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#17	655
-1@gl_k,154,94,3	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#18	655
-1@gl_k,145,99,6	duplicate(Khalitzburg Crusader#1)	White Knight#19	657
-1@gl_k,154,99,3	duplicate(Khalitzburg Crusader#1)	White Knight#20	657
-1@gl_k,145,104,6	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#21	655
-1@gl_k,154,104,3	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#22	655
+1@gl_k,154,54,3	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#2	4_F_KHALITZBURG
+1@gl_k,145,59,6	duplicate(Khalitzburg Crusader#1)	White Knight#3	4_WHITEKNIGHT
+1@gl_k,154,59,3	duplicate(Khalitzburg Crusader#1)	White Knight#4	4_WHITEKNIGHT
+1@gl_k,145,64,6	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#5	4_F_KHALITZBURG
+1@gl_k,154,64,3	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#6	4_F_KHALITZBURG
+1@gl_k,145,69,6	duplicate(Khalitzburg Crusader#1)	White Knight#7	4_WHITEKNIGHT
+1@gl_k,154,69,3	duplicate(Khalitzburg Crusader#1)	White Knight#8	4_WHITEKNIGHT
+1@gl_k,145,74,6	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#9	4_F_KHALITZBURG
+1@gl_k,154,74,3	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#10	4_F_KHALITZBURG
+1@gl_k,145,79,6	duplicate(Khalitzburg Crusader#1)	White Knight#11	4_WHITEKNIGHT
+1@gl_k,154,79,3	duplicate(Khalitzburg Crusader#1)	White Knight#12	4_WHITEKNIGHT
+1@gl_k,145,84,6	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#13	4_F_KHALITZBURG
+1@gl_k,154,84,3	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#14	4_F_KHALITZBURG
+1@gl_k,145,89,6	duplicate(Khalitzburg Crusader#1)	White Knight#15	4_WHITEKNIGHT
+1@gl_k,154,89,3	duplicate(Khalitzburg Crusader#1)	White Knight#16	4_WHITEKNIGHT
+1@gl_k,145,94,6	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#17	4_F_KHALITZBURG
+1@gl_k,154,94,3	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#18	4_F_KHALITZBURG
+1@gl_k,145,99,6	duplicate(Khalitzburg Crusader#1)	White Knight#19	4_WHITEKNIGHT
+1@gl_k,154,99,3	duplicate(Khalitzburg Crusader#1)	White Knight#20	4_WHITEKNIGHT
+1@gl_k,145,104,6	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#21	4_F_KHALITZBURG
+1@gl_k,154,104,3	duplicate(Khalitzburg Crusader#1)	Khalitzburg Crusader#22	4_F_KHALITZBURG
 
-1@gl_k,149,100,6	script	Heinrich#ghinstance1	652,{
+1@gl_k,149,100,6	script	Heinrich#ghinstance1	4_M_HEINRICH,{
 	if (getcharid(0) == getpartyleader(getcharid(1),2)) {
 		cutin "gl_heinrich2",2;
 		select("Heinrich, about the castle...");
@@ -293,7 +293,7 @@ OnEnable:
 	end;
 }
 
-1@gl_k,152,97,3	script	Varmunt#ghinstance2	654,{
+1@gl_k,152,97,3	script	Varmunt#ghinstance2	4_M_BARMUND,{
 	end;
 OnInstanceInit:
 	donpcevent instance_npcname("Varmunt#ghinstance2")+"::OnDisable";
@@ -327,7 +327,7 @@ OnTalk7:
 	end;
 }
 
-1@gl_k,149,97,6	script	Heinrich#ghinstance2	652,{
+1@gl_k,149,97,6	script	Heinrich#ghinstance2	4_M_HEINRICH,{
 	end;
 OnInstanceInit:
 	donpcevent instance_npcname("Heinrich#ghinstance2")+"::OnDisable";
@@ -370,7 +370,7 @@ OnTalk10:
 	end;
 }
 
-1@gl_k,149,100,6	script	Heinrich#ghinstance3	652,{
+1@gl_k,149,100,6	script	Heinrich#ghinstance3	4_M_HEINRICH,{
 	end;
 OnInstanceInit:
 	donpcevent instance_npcname("Heinrich#ghinstance3")+"::OnDisable";
@@ -407,7 +407,7 @@ OnTalk8:
 	end;
 }
 
-1@gl_k,149,89,1	script	Himmelmez#ghinstance1	650,{
+1@gl_k,149,89,1	script	Himmelmez#ghinstance1	4_F_HIMEL,{
 	end;
 OnInstanceInit:
 	donpcevent instance_npcname("Himmelmez#ghinstance1")+"::OnDisable";
@@ -746,7 +746,7 @@ OnTalkK:
 1@gl_k,145,104,6	duplicate(.#ghinstance1)	.#ghinstance21	2471
 1@gl_k,154,104,3	duplicate(.#ghinstance1)	.#ghinstance22	2471
 
-1@gl_k,145,59,6	script	.#ghinstance3	111,{
+1@gl_k,145,59,6	script	.#ghinstance3	HIDDEN_NPC,{
 	end;
 OnInstanceInit:
 	donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable";
@@ -762,17 +762,17 @@ OnEffect1:
 	specialeffect EF_LEXAETERNA;
 	end;
 }
-1@gl_k,154,59,3	duplicate(.#ghinstance3)	.#ghinstance4	111
-1@gl_k,145,69,6	duplicate(.#ghinstance3)	.#ghinstance7	111
-1@gl_k,154,69,3	duplicate(.#ghinstance3)	.#ghinstance8	111
-1@gl_k,145,79,6	duplicate(.#ghinstance3)	.#ghinstance11	111
-1@gl_k,154,79,3	duplicate(.#ghinstance3)	.#ghinstance12	111
-1@gl_k,145,89,6	duplicate(.#ghinstance3)	.#ghinstance15	111
-1@gl_k,154,89,3	duplicate(.#ghinstance3)	.#ghinstance16	111
-1@gl_k,145,99,6	duplicate(.#ghinstance3)	.#ghinstance19	111
-1@gl_k,154,99,3	duplicate(.#ghinstance3)	.#ghinstance20	111
+1@gl_k,154,59,3	duplicate(.#ghinstance3)	.#ghinstance4	HIDDEN_NPC
+1@gl_k,145,69,6	duplicate(.#ghinstance3)	.#ghinstance7	HIDDEN_NPC
+1@gl_k,154,69,3	duplicate(.#ghinstance3)	.#ghinstance8	HIDDEN_NPC
+1@gl_k,145,79,6	duplicate(.#ghinstance3)	.#ghinstance11	HIDDEN_NPC
+1@gl_k,154,79,3	duplicate(.#ghinstance3)	.#ghinstance12	HIDDEN_NPC
+1@gl_k,145,89,6	duplicate(.#ghinstance3)	.#ghinstance15	HIDDEN_NPC
+1@gl_k,154,89,3	duplicate(.#ghinstance3)	.#ghinstance16	HIDDEN_NPC
+1@gl_k,145,99,6	duplicate(.#ghinstance3)	.#ghinstance19	HIDDEN_NPC
+1@gl_k,154,99,3	duplicate(.#ghinstance3)	.#ghinstance20	HIDDEN_NPC
 
-1@gl_k,96,80,0	script	#ghinstancewarp1	45,1,2,{
+1@gl_k,96,80,0	script	#ghinstancewarp1	WARPNPC,1,2,{
 	end;
 OnInstanceInit:
 	donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable";
@@ -802,17 +802,17 @@ OnTouch:
 	}
 	end;
 }
-1@gl_k,90,80,0	duplicate(#ghinstancewarp1)	#ghinstancewarp2	45,1,2
-1@gl_k,202,79,0	duplicate(#ghinstancewarp1)	#ghinstancewarp3	45,1,2
-1@gl_k,206,79,0	duplicate(#ghinstancewarp1)	#ghinstancewarp4	45,1,2
-1@gl_k,228,216,0	duplicate(#ghinstancewarp1)	#ghinstancewarp5	45,1,2
-1@gl_k,222,216,0	duplicate(#ghinstancewarp1)	#ghinstancewarp6	45,1,2
-1@gl_k,150,284,0	duplicate(#ghinstancewarp1)	#ghinstancewarp7	45,1,2
-2@gl_k,145,123,0	duplicate(#ghinstancewarp1)	#ghinstancewarp8	45,1,2
-2@gl_k,136,122,0	duplicate(#ghinstancewarp1)	#ghinstancewarp9	45,1,2
-2@gl_k,154,101,0	duplicate(#ghinstancewarp1)	#ghinstancewarp10	45,1,2
-2@gl_k,165,101,0	duplicate(#ghinstancewarp1)	#ghinstancewarp11	45,1,2
-2@gl_k,150,163,0	duplicate(#ghinstancewarp1)	#ghinstancewarp12	45,1,2
+1@gl_k,90,80,0	duplicate(#ghinstancewarp1)	#ghinstancewarp2	WARPNPC,1,2
+1@gl_k,202,79,0	duplicate(#ghinstancewarp1)	#ghinstancewarp3	WARPNPC,1,2
+1@gl_k,206,79,0	duplicate(#ghinstancewarp1)	#ghinstancewarp4	WARPNPC,1,2
+1@gl_k,228,216,0	duplicate(#ghinstancewarp1)	#ghinstancewarp5	WARPNPC,1,2
+1@gl_k,222,216,0	duplicate(#ghinstancewarp1)	#ghinstancewarp6	WARPNPC,1,2
+1@gl_k,150,284,0	duplicate(#ghinstancewarp1)	#ghinstancewarp7	WARPNPC,1,2
+2@gl_k,145,123,0	duplicate(#ghinstancewarp1)	#ghinstancewarp8	WARPNPC,1,2
+2@gl_k,136,122,0	duplicate(#ghinstancewarp1)	#ghinstancewarp9	WARPNPC,1,2
+2@gl_k,154,101,0	duplicate(#ghinstancewarp1)	#ghinstancewarp10	WARPNPC,1,2
+2@gl_k,165,101,0	duplicate(#ghinstancewarp1)	#ghinstancewarp11	WARPNPC,1,2
+2@gl_k,150,163,0	duplicate(#ghinstancewarp1)	#ghinstancewarp12	WARPNPC,1,2
 
 
 // Sector 1 Mobs
@@ -847,7 +847,7 @@ OnMyMobDead:
 	end;
 }
 
-1@gl_k,17,51,3	script	Aspiring Butcher#clearGH	706,{
+1@gl_k,17,51,3	script	Aspiring Butcher#clearGH	4_M_KID1,{
 	if (getcharid(0) == getpartyleader(getcharid(1),2)) {
 		mes "[Aspiring Butcher]";
 		mes "Help me! Help me!!!";
@@ -903,7 +903,7 @@ OnEnable:
 
 // Sector 2 Mobs
 //============================================================
-1@gl_k,291,145,3	script	Hollgrehenn Destroyer	726,{
+1@gl_k,291,145,3	script	Hollgrehenn Destroyer	4_F_JOB_BLACKSMITH,{
 	if (getcharid(0) == getpartyleader(getcharid(1),2)) {
 		mes "[Hollgrehenn Destroyer]";
 		mes "Yaaa!! Die!!!";
@@ -989,7 +989,7 @@ OnMyMobDead:
 
 // Tramp Mobs
 //============================================================
-1@gl_k,221,82,3	script	Breathless Man#GHtramp1	849,4,4,{
+1@gl_k,221,82,3	script	Breathless Man#GHtramp1	4_M_DIEMAN,4,4,{
 	end;
 OnTouch:
 	set .@i, rand(1,10);
@@ -1015,37 +1015,37 @@ OnDisable:
 	disablenpc instance_npcname(strnpcinfo(0));
 	end;
 }
-1@gl_k,213,63,7	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp2	849,4,4
-1@gl_k,230,50,2	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp3	849,4,4
-1@gl_k,222,39,2	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp4	849,4,4
-1@gl_k,214,27,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp5	849,4,4
-1@gl_k,223,17,2	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp6	849,4,4
-1@gl_k,235,16,4	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp7	849,4,4
-1@gl_k,251,20,5	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp8	849,4,4
-1@gl_k,240,43,5	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp9	849,4,4
-1@gl_k,271,19,1	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp10	849,4,4
-1@gl_k,246,62,7	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp11	849,4,4
-1@gl_k,282,48,7	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp12	849,4,4
-1@gl_k,285,81,7	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp13	849,4,4
-1@gl_k,241,86,5	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp14	849,4,4
-1@gl_k,249,101,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp15	849,4,4
-1@gl_k,276,106,7	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp16	849,4,4
-1@gl_k,252,120,7	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp17	849,4,4
-1@gl_k,258,150,1	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp18	849,4,4
-1@gl_k,255,157,6	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp19	849,4,4
-1@gl_k,261,164,7	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp20	849,4,4
-1@gl_k,269,173,7	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp21	849,4,4
-1@gl_k,280,167,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp22	849,4,4
-1@gl_k,293,161,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp23	849,4,4
-1@gl_k,226,96,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp24	849,4,4
-1@gl_k,222,119,5	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp25	849,4,4
-1@gl_k,233,123,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp26	849,4,4
-2@gl_k,147,203,5	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp27	849,4,4
-2@gl_k,141,222,1	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp28	849,4,4
-2@gl_k,167,225,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp29	849,4,4
-2@gl_k,145,236,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp30	849,4,4
-2@gl_k,143,260,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp31	849,4,4
-2@gl_k,173,258,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp32	849,4,4
+1@gl_k,213,63,7	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp2	4_M_DIEMAN,4,4
+1@gl_k,230,50,2	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp3	4_M_DIEMAN,4,4
+1@gl_k,222,39,2	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp4	4_M_DIEMAN,4,4
+1@gl_k,214,27,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp5	4_M_DIEMAN,4,4
+1@gl_k,223,17,2	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp6	4_M_DIEMAN,4,4
+1@gl_k,235,16,4	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp7	4_M_DIEMAN,4,4
+1@gl_k,251,20,5	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp8	4_M_DIEMAN,4,4
+1@gl_k,240,43,5	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp9	4_M_DIEMAN,4,4
+1@gl_k,271,19,1	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp10	4_M_DIEMAN,4,4
+1@gl_k,246,62,7	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp11	4_M_DIEMAN,4,4
+1@gl_k,282,48,7	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp12	4_M_DIEMAN,4,4
+1@gl_k,285,81,7	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp13	4_M_DIEMAN,4,4
+1@gl_k,241,86,5	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp14	4_M_DIEMAN,4,4
+1@gl_k,249,101,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp15	4_M_DIEMAN,4,4
+1@gl_k,276,106,7	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp16	4_M_DIEMAN,4,4
+1@gl_k,252,120,7	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp17	4_M_DIEMAN,4,4
+1@gl_k,258,150,1	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp18	4_M_DIEMAN,4,4
+1@gl_k,255,157,6	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp19	4_M_DIEMAN,4,4
+1@gl_k,261,164,7	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp20	4_M_DIEMAN,4,4
+1@gl_k,269,173,7	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp21	4_M_DIEMAN,4,4
+1@gl_k,280,167,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp22	4_M_DIEMAN,4,4
+1@gl_k,293,161,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp23	4_M_DIEMAN,4,4
+1@gl_k,226,96,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp24	4_M_DIEMAN,4,4
+1@gl_k,222,119,5	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp25	4_M_DIEMAN,4,4
+1@gl_k,233,123,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp26	4_M_DIEMAN,4,4
+2@gl_k,147,203,5	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp27	4_M_DIEMAN,4,4
+2@gl_k,141,222,1	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp28	4_M_DIEMAN,4,4
+2@gl_k,167,225,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp29	4_M_DIEMAN,4,4
+2@gl_k,145,236,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp30	4_M_DIEMAN,4,4
+2@gl_k,143,260,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp31	4_M_DIEMAN,4,4
+2@gl_k,173,258,3	duplicate(Breathless Man#GHtramp1)	Breathless Man#GHtramp32	4_M_DIEMAN,4,4
 
 // Sector 3 Mobs
 //============================================================
@@ -1115,7 +1115,7 @@ OnMyMobDead:
 	end;
 }
 
-1@gl_k,150,257,3	script	#GHMclear3	111,9,9,{
+1@gl_k,150,257,3	script	#GHMclear3	HIDDEN_NPC,9,9,{
 	end;
 OnTouch:
 	donpcevent instance_npcname("#controlGH3")+"::OnEnable";
@@ -1195,7 +1195,7 @@ OnTimer38000:
 	end;
 }
 
-1@gl_k,144,258,6	script	Heinrich#ghinstance4	652,{
+1@gl_k,144,258,6	script	Heinrich#ghinstance4	4_M_HEINRICH,{
 	mes "[Heinrich]";
 	mes "Himmelmez... You made my men get killed and I will never forget that.";
 	cutin "gl_heinrich1",2;
@@ -1222,7 +1222,7 @@ OnTalk3:
 	end;
 }
 
-1@gl_k,150,257,3	script	Himmelmez#ghinstance2	650,{
+1@gl_k,150,257,3	script	Himmelmez#ghinstance2	4_F_HIMEL,{
 	mes "[Himmelmez]";
 	mes "No need to stare at me with so insecure eyes. Soon they'll become relaxed...";
 	cutin "gl_himel2",2;
@@ -1258,7 +1258,7 @@ OnTalk6:
 	end;
 }
 
-1@gl_k,156,259,3	script	Varmunt#ghinstance3	654,{
+1@gl_k,156,259,3	script	Varmunt#ghinstance3	4_M_BARMUND,{
 	if (checkquest(12318,HUNTING) == 2) {
 		if (checkquest(12319,HUNTING) == -1) {
 			mes "[Varmunt]";
@@ -1296,7 +1296,7 @@ OnTalk2:
 
 // Floor 2
 //============================================================
-2@gl_k,148,67,1	script	Heinrich#ghinstance5	652,{
+2@gl_k,148,67,1	script	Heinrich#ghinstance5	4_M_HEINRICH,{
 	mes "[Heinrich]";
 	mes "Himmelmez's blocking spells";
 	mes "are everywhere around here...";
@@ -1330,7 +1330,7 @@ OnTalk5:
 	end;
 }
 
-2@gl_k,151,71,7	script	Varmunt#ghinstance4	654,{
+2@gl_k,151,71,7	script	Varmunt#ghinstance4	4_M_BARMUND,{
 	mes "[Varmunt]";
 	mes "Why am I doing this again? Doesn't seem like the first time. I've seen this place repeatedly dozens of times in my dreams. This feeling...";
 	cutin "gl_barmund1",2;
@@ -1396,7 +1396,7 @@ OnTalk17:
 	end;
 }
 
-2@gl_k,150,67,0	script	#effectGH01	111,10,10,{
+2@gl_k,150,67,0	script	#effectGH01	HIDDEN_NPC,10,10,{
 	end;
 OnTouch:
 	specialeffect EF_BASH;
@@ -1717,7 +1717,7 @@ OnMyMobDead:
 	end;
 }
 
-2@gl_k,155,250,7	script	Heinrich#ghinstance6	652,{
+2@gl_k,155,250,7	script	Heinrich#ghinstance6	4_M_HEINRICH,{
 	end;
 OnInstanceInit:
 	donpcevent instance_npcname("Heinrich#ghinstance6")+"::OnDisable";
@@ -1748,7 +1748,7 @@ OnTalk6:
 	end;
 }
 
-2@gl_k,162,250,1	script	Varmunt#ghinstance5	654,{
+2@gl_k,162,250,1	script	Varmunt#ghinstance5	4_M_BARMUND,{
 	mes "[Varmunt]";
 	mes "We can't escape this";
 	mes "eternal confinement...";
@@ -1770,7 +1770,7 @@ OnTalk1:
 	end;
 }
 
-2@gl_k,158,252,3	script	Himmelmez#ghinstance4	650,4,4,{
+2@gl_k,158,252,3	script	Himmelmez#ghinstance4	4_F_HIMEL,4,4,{
 	end;	
 OnInstanceInit:
 	donpcevent instance_npcname("Himmelmez#ghinstance4")+"::OnDisable";
@@ -1816,7 +1816,7 @@ OnTalk11:
 	end;
 }
 
-2@gl_k,150,179,0	script	#controlGH6	111,2,2,{
+2@gl_k,150,179,0	script	#controlGH6	HIDDEN_NPC,2,2,{
 	end;
 OnTouch:
 	mapannounce instance_mapname("2@gl_k"), "???: Do not come! There are traps everywhere here... Aaaaack!!!!",bc_map,"0xFF0000";
@@ -1838,7 +1838,7 @@ OnEnable:
 	end;
 }
 
-2@gl_k,158,252,1	script	Himmelmez#ghinstance3	650,7,7,{
+2@gl_k,158,252,1	script	Himmelmez#ghinstance3	4_F_HIMEL,7,7,{
 	end;
 OnTouch:
 	specialeffect EF_BASH;
@@ -1857,7 +1857,7 @@ OnEnable:
 	end;
 }
 
-2@gl_k,158,255,3	script	Gerhard#ghinstance1	651,{
+2@gl_k,158,255,3	script	Gerhard#ghinstance1	4_LEVITATEMAN,{
 	end;
 OnInstanceInit:
 	donpcevent instance_npcname("Gerhard#ghinstance1")+"::OnDisable";
@@ -1997,7 +1997,7 @@ OnTimer80000:
 	end;
 }
 
-2@gl_k,158,241,1	script	Hugin#ghinstance1	755,{
+2@gl_k,158,241,1	script	Hugin#ghinstance1	4_M_SAGE_C,{
 	if (checkquest(12319,HUNTING) == 2) {
 		mes "[Hugin]";
 		mes "Well, you are pretty ridiculous. Beginners shouldn't get the loot Amdarias drops.";