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

1 files changed, 56 insertions, 56 deletions

diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt
index ccc03b7f2..26782eb94 100644
--- a/npc/re/jobs/3-1/archbishop.txt
+++ b/npc/re/jobs/3-1/archbishop.txt
@@ -24,7 +24,7 @@
 //= 1.9 Added GM management function. [Euphy]
 //============================================================
 
-prt_church,103,88,3	script	Praying Minister#arch	60,{
+prt_church,103,88,3	script	Praying Minister#arch	1_M_PASTOR,{
 	if (BaseJob != Job_Priest) {
 		if (Class == Job_Arch_Bishop || Class == Job_Arch_Bishop_T || Class == Job_Baby_Bishop) {
 			mes "[Praying Minister]";
@@ -162,13 +162,13 @@ prt_church,103,88,3	script	Praying Minister#arch	60,{
 	close;
 }
 
-umbala,137,227,5	script	Utan Boy#arch	787,{
+umbala,137,227,5	script	Utan Boy#arch	4_M_UMKID,{
 	mes "[Utan Boy]";
 	mes "........";
 	close;
 }
 
-umbala,139,227,3	script	Priest#arch	60,{
+umbala,139,227,3	script	Priest#arch	1_M_PASTOR,{
 	if (job_arch == 0) {
 		mes "[Priest]";
 		mes "Un...ba... Unba?";
@@ -414,7 +414,7 @@ umbala,139,227,3	script	Priest#arch	60,{
 	close;
 }
 
-yggdrasil01,220,47,0	script	#arch_pilgrimage	139,5,5,{
+yggdrasil01,220,47,0	script	#arch_pilgrimage	HIDDEN_WARP_NPC,5,5,{
 OnTouch:
 	if (job_arch == 2) {
 		mes "[" + strcharinfo(0) + "]";
@@ -573,7 +573,7 @@ OnTouch:
 	end;
 }
 
-hu_in01,205,204,7	script	Praying Nun#benew	79,{
+hu_in01,205,204,7	script	Praying Nun#benew	1_F_PRIEST,{
 	if (job_arch == 4) {
 		mes "- There is a nun closing her eyes as she murmurs something which sounds like a prayer. -";
 		next;
@@ -722,14 +722,14 @@ hu_in01,205,204,7	script	Praying Nun#benew	79,{
 	close;
 }
 
-odin_tem02,282,263,0	script	#find_val	139,3,3,{
+odin_tem02,282,263,0	script	#find_val	HIDDEN_WARP_NPC,3,3,{
 OnTouch:
 	if ((job_arch > 4) && (job_arch < 100))
 		hideoffnpc "Valkyrie Illusion#arch";
 	end;
 }
 
-odin_tem02,281,275,3	script	Valkyrie Illusion#arch	403,{
+odin_tem02,281,275,3	script	Valkyrie Illusion#arch	4_F_VALKYRIE2,{
 	if ((job_arch > 4) && (job_arch < 100)) {
 		mes "You can see Valkyrie who has a despairing face.";
 		next;
@@ -754,7 +754,7 @@ OnInit:
 	end;
 }
 
-job3_arch01,29,34,3	script	Valkyrie#arch	403,{
+job3_arch01,29,34,3	script	Valkyrie#arch	4_F_VALKYRIE2,{
 	if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 2000) {
 		mes "- Wait a Sec !! -";
 		mes "- You are carrying too many items, -";
@@ -980,7 +980,7 @@ OnBc:
 	end;
 }
 
-job3_arch02,119,49,0	script	#arch_1_start	139,6,6,{
+job3_arch02,119,49,0	script	#arch_1_start	HIDDEN_WARP_NPC,6,6,{
 OnTouch:
 	if (countitem(12381) == 0)
 		getitem 12381,1; //ValkyrieA_Scroll
@@ -1008,20 +1008,20 @@ OnTouch:
 	mapwarp "job3_arch02","job3_arch01",29,29;
 	end;
 }
-job3_arch02,112,73,0	duplicate(archbjcq)	#arch_1_01	139,5,5
-job3_arch02,94,123,0	duplicate(archbjcq)	#arch_1_02	139,5,5
-job3_arch02,93,173,0	duplicate(archbjcq)	#arch_1_03	139,5,5
-job3_arch02,114,186,0	duplicate(archbjcq)	#arch_1_04	139,5,5
-job3_arch02,134,201,0	duplicate(archbjcq)	#arch_1_05	139,5,5
-job3_arch02,154,211,0	duplicate(archbjcq)	#arch_1_06	139,5,5
-job3_arch02,175,227,0	duplicate(archbjcq)	#arch_1_07	139,5,5
-job3_arch02,201,240,0	duplicate(archbjcq)	#arch_1_08	139,5,5
-job3_arch02,223,252,0	duplicate(archbjcq)	#arch_1_09	139,5,5
-job3_arch02,255,268,0	duplicate(archbjcq)	#arch_1_10	139,5,5
-job3_arch02,269,302,0	duplicate(archbjcq)	#arch_1_11	139,5,5
-job3_arch02,245,289,0	duplicate(archbjcq)	#arch_1_12	139,5,5
+job3_arch02,112,73,0	duplicate(archbjcq)	#arch_1_01	HIDDEN_WARP_NPC,5,5
+job3_arch02,94,123,0	duplicate(archbjcq)	#arch_1_02	HIDDEN_WARP_NPC,5,5
+job3_arch02,93,173,0	duplicate(archbjcq)	#arch_1_03	HIDDEN_WARP_NPC,5,5
+job3_arch02,114,186,0	duplicate(archbjcq)	#arch_1_04	HIDDEN_WARP_NPC,5,5
+job3_arch02,134,201,0	duplicate(archbjcq)	#arch_1_05	HIDDEN_WARP_NPC,5,5
+job3_arch02,154,211,0	duplicate(archbjcq)	#arch_1_06	HIDDEN_WARP_NPC,5,5
+job3_arch02,175,227,0	duplicate(archbjcq)	#arch_1_07	HIDDEN_WARP_NPC,5,5
+job3_arch02,201,240,0	duplicate(archbjcq)	#arch_1_08	HIDDEN_WARP_NPC,5,5
+job3_arch02,223,252,0	duplicate(archbjcq)	#arch_1_09	HIDDEN_WARP_NPC,5,5
+job3_arch02,255,268,0	duplicate(archbjcq)	#arch_1_10	HIDDEN_WARP_NPC,5,5
+job3_arch02,269,302,0	duplicate(archbjcq)	#arch_1_11	HIDDEN_WARP_NPC,5,5
+job3_arch02,245,289,0	duplicate(archbjcq)	#arch_1_12	HIDDEN_WARP_NPC,5,5
 
-job3_arch02,203,286,0	script	#arch_1_boss	139,5,5,{
+job3_arch02,203,286,0	script	#arch_1_boss	HIDDEN_WARP_NPC,5,5,{
 OnTouch:
 	if (countitem(12381)) {
 		delitem 12381,1; //ValkyrieA_Scroll
@@ -1051,7 +1051,7 @@ OnRed:
 	end;
 }
 
-job3_arch02,390,389,1	script	#arch_val01	844,{
+job3_arch02,390,389,1	script	#arch_val01	CLEAR_NPC,{
 	end;
 OnEnable:
 	areamonster "job3_arch02",111,325,115,329,"Valkyrie's Nightmare",2036,1,"#arch_val01::OnMyMobDead";
@@ -1082,7 +1082,7 @@ OnKill:
 	end;
 }
 
-job3_arch02,390,387,1	script	#arch_val02	844,{
+job3_arch02,390,387,1	script	#arch_val02	CLEAR_NPC,{
 	end;
 OnEnable:
 	areamonster "job3_arch02",242,44,246,48,"Valkyrie's Nightmare",2036,1,"#arch_val02::OnMyMobDead";
@@ -1100,7 +1100,7 @@ OnKill:
 	end;
 }
 
-job3_arch02,113,327,5	script	Valkyrie#arch_01	403,{
+job3_arch02,113,327,5	script	Valkyrie#arch_01	4_F_VALKYRIE2,{
 	if (getmercinfo(1)) {
 		mes "[Valkyrie]";
 		mes "If you want to talk with me, you have to ^3131FFcancel all contracts^000000 with any mercenaries you have.";
@@ -1135,7 +1135,7 @@ job3_arch02,113,327,5	script	Valkyrie#arch_01	403,{
 	end;
 }
 
-job3_arch02,244,46,5	script	Valkyrie#arch_02	403,{
+job3_arch02,244,46,5	script	Valkyrie#arch_02	4_F_VALKYRIE2,{
 	mes "[Valkyrie Anguhilde]";
 	mes "Did you find the rest of the pieces?";
 	next;
@@ -1172,7 +1172,7 @@ job3_arch02,244,46,5	script	Valkyrie#arch_02	403,{
 	end;
 }
 
-job3_arch02,279,234,0	script	#arch_end	139,7,7,{
+job3_arch02,279,234,0	script	#arch_end	HIDDEN_WARP_NPC,7,7,{
 	end;
 OnTouch:
 	donpcevent "#arch_3_01::OnKill";
@@ -1304,14 +1304,14 @@ OnInit:
 	end;
 }
 
-job3_arch02,281,232,1	script	Valkyrie Anguhilde#end	403,{
+job3_arch02,281,232,1	script	Valkyrie Anguhilde#end	4_F_VALKYRIE2,{
 	end;
 OnInit:
 	hideonnpc "Valkyrie Anguhilde#end";
 	end;
 }
 
-job3_arch02,273,235,5	script	Valkyrie of the heavens	811,{
+job3_arch02,273,235,5	script	Valkyrie of the heavens	4_F_VALKYRIE,{
 	if (job_arch == 100) {
 		mes "[Valkyrie of the heavens]";
 		mes "Now, go back to your world.";
@@ -1330,7 +1330,7 @@ OnInit:
 	end;
 }
 
-job3_arch02,132,323,0	script	#arch_2_01	139,5,5,{
+job3_arch02,132,323,0	script	#arch_2_01	HIDDEN_WARP_NPC,5,5,{
 	end;
 OnTouch:
 	if (countitem(12382))
@@ -1357,33 +1357,33 @@ OnTouch:
 	mapwarp "job3_arch02","job3_arch01",29,29;
 	end;
 }
-job3_arch02,167,313,0	duplicate(archbjcq2)	#arch_2_02	139,5,5
-job3_arch02,127,304,0	duplicate(archbjcq2)	#arch_2_03	139,5,5
-job3_arch02,207,279,0	duplicate(archbjcq2)	#arch_2_04	139,5,5
-job3_arch02,239,281,0	duplicate(archbjcq2)	#arch_2_05	139,5,5
-job3_arch02,269,303,0	duplicate(archbjcq2)	#arch_2_06	139,5,5
-job3_arch02,288,283,0	duplicate(archbjcq2)	#arch_2_07	139,5,5
-job3_arch02,278,234,0	duplicate(archbjcq2)	#arch_2_08	139,5,5
-job3_arch02,234,179,0	duplicate(archbjcq2)	#arch_2_09	139,5,5
-job3_arch02,227,169,0	duplicate(archbjcq2)	#arch_2_10	139,5,5
-job3_arch02,190,146,0	duplicate(archbjcq2)	#arch_2_11	139,5,5
+job3_arch02,167,313,0	duplicate(archbjcq2)	#arch_2_02	HIDDEN_WARP_NPC,5,5
+job3_arch02,127,304,0	duplicate(archbjcq2)	#arch_2_03	HIDDEN_WARP_NPC,5,5
+job3_arch02,207,279,0	duplicate(archbjcq2)	#arch_2_04	HIDDEN_WARP_NPC,5,5
+job3_arch02,239,281,0	duplicate(archbjcq2)	#arch_2_05	HIDDEN_WARP_NPC,5,5
+job3_arch02,269,303,0	duplicate(archbjcq2)	#arch_2_06	HIDDEN_WARP_NPC,5,5
+job3_arch02,288,283,0	duplicate(archbjcq2)	#arch_2_07	HIDDEN_WARP_NPC,5,5
+job3_arch02,278,234,0	duplicate(archbjcq2)	#arch_2_08	HIDDEN_WARP_NPC,5,5
+job3_arch02,234,179,0	duplicate(archbjcq2)	#arch_2_09	HIDDEN_WARP_NPC,5,5
+job3_arch02,227,169,0	duplicate(archbjcq2)	#arch_2_10	HIDDEN_WARP_NPC,5,5
+job3_arch02,190,146,0	duplicate(archbjcq2)	#arch_2_11	HIDDEN_WARP_NPC,5,5
 
 /*
 // Not in official script.
-job3_arch02,252,267,0	script	#arch_2_12	139,5,5,{
+job3_arch02,252,267,0	script	#arch_2_12	HIDDEN_WARP_NPC,5,5,{
 OnTouch:
 	mapannounce "job3_arch02","Whispering of an impersonation: It's a crossroad. Let's go to the left side. I have to find my pipe.",bc_map,"0xFFCE00";
 	end;
 }
 
-job3_arch02,250,290,0	script	#arch_2_13	139,5,5,{
+job3_arch02,250,290,0	script	#arch_2_13	HIDDEN_WARP_NPC,5,5,{
 OnTouch:
 	mapannounce "job3_arch02","Whispering of an impersonation: I can see a ruined shrine. Take a rest in there.",bc_map,"0xFFCE00";
 	end;
 }
 */
 
-job3_arch02,206,113,0	script	#arch_2_boss	139,5,5,{
+job3_arch02,206,113,0	script	#arch_2_boss	HIDDEN_WARP_NPC,5,5,{
 OnTouch:
 	if (countitem(12382)) {
 		delitem 12382,1; //ValkyrieB_Scroll
@@ -1397,7 +1397,7 @@ OnTouch:
 	end;
 }
 
-job3_arch02,284,159,0	script	#arch_3_01	139,20,20,{
+job3_arch02,284,159,0	script	#arch_3_01	HIDDEN_WARP_NPC,20,20,{
 OnTouch:
 	if (Class != Job_Priest) {
 		mapannounce "job3_arch02","Frus: Do you want to see God? Okay, I'll send you to the land of the dead by myself!",bc_map,"0xFF0000";
@@ -1415,7 +1415,7 @@ OnKill:
 //	end;
 }
 
-job3_arch02,307,200,0	script	#arch_3_02	139,5,5,{
+job3_arch02,307,200,0	script	#arch_3_02	HIDDEN_WARP_NPC,5,5,{
 OnTouch:
 	if (BaseJob == Job_Priest) {
 		mapannounce "job3_arch02","Skogul: You are my guest!",bc_map,"0xFF0000";
@@ -1433,7 +1433,7 @@ OnKill:
 //	end;
 }
 
-job3_arch02,296,216,0	script	#arch_3_03	139,5,5,{
+job3_arch02,296,216,0	script	#arch_3_03	HIDDEN_WARP_NPC,5,5,{
 OnTouch:
 	mapannounce "job3_arch02","Frus: I like your face... Can I steal it?",bc_map,"0xFF0000";
 	monster "job3_arch02",296,216,"Frus",1762,1,"#arch_3_03::OnMyMobDead";
@@ -1449,7 +1449,7 @@ OnInit:
 	end;
 }
 
-job3_arch02,389,390,1	script	mob#arch_1	844,{
+job3_arch02,389,390,1	script	mob#arch_1	CLEAR_NPC,{
 	end;
 OnEnable:
 	monster "job3_arch02",100,102,"Shrine Invader",1394,2,"mob#arch_1::OnMyMobDead";
@@ -1470,7 +1470,7 @@ OnKill:
 	end;
 }
 
-job3_arch02,389,389,1	script	mob#arch_2	844,{
+job3_arch02,389,389,1	script	mob#arch_2	CLEAR_NPC,{
 	end;
 OnEnable:
 	monster "job3_arch02",156,321,"Shrine Invader",1480,2,"mob#arch_2::OnMyMobDead";
@@ -1493,7 +1493,7 @@ OnKill:
 	end;
 }
 
-job3_arch02,389,388,1	script	start#arch	844,{
+job3_arch02,389,388,1	script	start#arch	CLEAR_NPC,{
 	end;
 OnInit:
 	mapwarp "job3_arch02","job3_arch01",29,29;
@@ -1581,7 +1581,7 @@ OnTimer605000:
 	end;
 }
 
-job3_arch02,390,388,1	script	#arch_2_start	844,{
+job3_arch02,390,388,1	script	#arch_2_start	CLEAR_NPC,{
 	end;
 OnInit:
 	disablenpc "#arch_2_01";
@@ -1615,7 +1615,7 @@ OnEnable:
 	end;
 }
 
-job3_arch02,390,386,1	script	#arch_3_start	844,{
+job3_arch02,390,386,1	script	#arch_3_start	CLEAR_NPC,{
 	end;
 OnEnable:
 	enablenpc "#arch_3_01";
@@ -1626,14 +1626,14 @@ OnEnable:
 	end;
 }
 
-job3_arch02,290,221,0	script	#arch_end_eff	139,5,5,{
+job3_arch02,290,221,0	script	#arch_end_eff	HIDDEN_WARP_NPC,5,5,{
 OnTouch:
 	specialeffect EF_MAPPILLAR2,"#arch_end";
 	end;
 }
 
 /*
-job_arch01,26,25,0	script	#archremove	139,3,3,{
+job_arch01,26,25,0	script	#archremove	HIDDEN_WARP_NPC,3,3,{
 OnTouch:
 	if (countitem(6154)) delitem 6154, countitem(6154); //Broken_Horn_Pipe
 	if (countitem(12381)) delitem 12381, countitem(12381); //ValkyrieA_Scroll
@@ -1643,7 +1643,7 @@ OnTouch:
 }
 */
 
-job3_arch01,1,1,1	script	control#arch	844,{
+job3_arch01,1,1,1	script	control#arch	CLEAR_NPC,{
 	callfunc "F_GM_NPC";
 	mes "[Troll]";
 	mes "Password please.";
@@ -1671,14 +1671,14 @@ job3_arch01,1,1,1	script	control#arch	844,{
 	}
 }
 
-odin_tem02,30,181,0	script	#wherearch01	139,10,10,{
+odin_tem02,30,181,0	script	#wherearch01	HIDDEN_WARP_NPC,10,10,{
 OnTouch:
 	if (job_arch == 5)
 		viewpoint 1,282,263,1,0xFFFF99;
 	end;
 }
 
-odin_tem02,30,335,0	script	#wherearch02	139,10,10,{
+odin_tem02,30,335,0	script	#wherearch02	HIDDEN_WARP_NPC,10,10,{
 OnTouch:
 	if (job_arch == 5)
 		viewpoint 1,282,263,1,0xFFFF99;