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

1 files changed, 33 insertions, 33 deletions

diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt
index f9264574a..ffb395e07 100644
--- a/npc/re/jobs/3-1/rune_knight.txt
+++ b/npc/re/jobs/3-1/rune_knight.txt
@@ -17,7 +17,7 @@
 //= 1.5 Added GM management function. [Euphy]
 //============================================================
 
-prt_in,162,24,3	script	Splendid-Looking Knight	470,2,2,{
+prt_in,162,24,3	script	Splendid-Looking Knight	4_M_KNIGHT_SILVER,2,2,{
 	mes "[Rune Knight Manuel]";
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "You are now a member of our select brethren. I can still remember when I first met you.";
@@ -125,7 +125,7 @@ prt_in,162,24,3	script	Splendid-Looking Knight	470,2,2,{
 	close;
 }
 
-glast_01,44,363,3	script	Guide, Jungberg	468,2,2,{
+glast_01,44,363,3	script	Guide, Jungberg	4_M_KNIGHT_BLACK,2,2,{
 	mes "[Guide, Jungberg]";
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "Oh, you must be "+strcharinfo(0)+".";
@@ -249,7 +249,7 @@ glast_01,44,363,3	script	Guide, Jungberg	468,2,2,{
 	}
 }
 
-gl_knt02,150,55,3	script	Rune Knight Staff	83,2,2,{
+gl_knt02,150,55,3	script	Rune Knight Staff	4_M_01,2,2,{
 	mes "[Rune Knight Staff]";
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "Welcome, "+strcharinfo(0)+". Are you going to the gathering place?";
@@ -296,7 +296,7 @@ gl_knt02,150,55,3	script	Rune Knight Staff	83,2,2,{
 	close;
 }
 
-job3_rune01,80,60,3	script	Rune Knight Captain	470,2,2,{
+job3_rune01,80,60,3	script	Rune Knight Captain	4_M_KNIGHT_SILVER,2,2,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
 		mes "You've got too many things. You cannot proceed anymore. Please try again after losing some weight.";
 		close;
@@ -574,7 +574,7 @@ L_Warning:
 	return;
 }
 
-job3_rune01,90,50,3	script	Rune Knight Lunarea	469,2,2,{
+job3_rune01,90,50,3	script	Rune Knight Lunarea	4_M_KNIGHT_GOLD,2,2,{
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "She holds up her chin quietly, nods lightly and notices me.";
 		next;
@@ -688,7 +688,7 @@ L_Test:
 	close;
 }
 
-job3_rune01,55,50,3	script	Rune Knight, Renoa	469,2,2,{
+job3_rune01,55,50,3	script	Rune Knight, Renoa	4_M_KNIGHT_GOLD,2,2,{
 	mes "[Rune Knight, Renoa]";
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "Congratulations for becoming one of us. Junior Rune Knight, "+strcharinfo(0)+".";
@@ -904,7 +904,7 @@ job3_rune01,55,50,3	script	Rune Knight, Renoa	469,2,2,{
 	close;
 }
 
-job3_rune01,58,51,1	script	Rune Furnace	844,{
+job3_rune01,58,51,1	script	Rune Furnace	CLEAR_NPC,{
 	if (job_rune_edq < 15) {
 		mes "[Rune Knight Renoa]";
 		mes "You don't want to touch that thing. Believe me, I'm not kidding.";
@@ -976,7 +976,7 @@ job3_rune01,58,51,1	script	Rune Furnace	844,{
 	close;
 }
 
-job3_rune01,40,54,1	script	Runes and Rune Knights	844,{
+job3_rune01,40,54,1	script	Runes and Rune Knights	CLEAR_NPC,{
 	if (job_rune_edq < 8) {
 		mes "[Rune Knight Renoa]";
 		mes "Besides touching stuff in this place without permission. Would you be able to understand the contents of the book?";
@@ -1035,7 +1035,7 @@ job3_rune01,40,54,1	script	Runes and Rune Knights	844,{
 	}
 }
 
-job3_rune01,43,44,1	script	The Principles of Runes	844,{
+job3_rune01,43,44,1	script	The Principles of Runes	CLEAR_NPC,{
 	if (job_rune_edq < 8) {
 		mes "[Rune Knight Renoa]";
 		mes "Besides touching stuff in this place without permission. Would you be able to understand the contents of the book?";
@@ -1082,7 +1082,7 @@ job3_rune01,43,44,1	script	The Principles of Runes	844,{
 	}
 }
 
-job3_rune01,50,36,1	script	Runes, Make & Use	844,{
+job3_rune01,50,36,1	script	Runes, Make & Use	CLEAR_NPC,{
 	if (job_rune_edq < 8) {
 		mes "[Rune Knight Renoa]";
 		mes "Besides touching stuff in this place without permission. Would you be able to understand the contents of the book?";
@@ -1181,7 +1181,7 @@ job3_rune01,50,36,1	script	Runes, Make & Use	844,{
 	}
 }
 
-mid_camp,238,250,3	script	Rune Knight Sage Guard	468,2,2,{
+mid_camp,238,250,3	script	Rune Knight Sage Guard	4_M_KNIGHT_BLACK,2,2,{
 	mes "[Rune Knight Sage Guard]";
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "The sage Serpeone is the one who has been with us since the beginning of the Rune Knights.";
@@ -1208,7 +1208,7 @@ mid_camp,238,250,3	script	Rune Knight Sage Guard	468,2,2,{
 	close;
 }
 
-mid_camp,13,138,3	script	Dispatched Rune Knight#1	83,2,2,{
+mid_camp,13,138,3	script	Dispatched Rune Knight#1	4_M_01,2,2,{
 	mes "[Dispatched Rune Knight]";
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "Thanks for your work. We will continue our mission for the Rune Knight testers.";
@@ -1236,9 +1236,9 @@ mid_camp,13,138,3	script	Dispatched Rune Knight#1	83,2,2,{
 	mes "Shh... Our mission is not something to be revealed to the public. Please just move along.";
 	close;
 }
-spl_fild01,361,327,3	duplicate(Dispatched Rune Knight#1)	Dispatched Rune Knight#2	83,2,2
+spl_fild01,361,327,3	duplicate(Dispatched Rune Knight#1)	Dispatched Rune Knight#2	4_M_01,2,2
 
-spl_fild02,13,241,0	script	#Barricade1	139,10,10,{
+spl_fild02,13,241,0	script	#Barricade1	HIDDEN_WARP_NPC,10,10,{
 	end;
 OnTouch:
 	if (job_rune_edq > 0 && job_rune_edq < 23) {
@@ -1256,7 +1256,7 @@ OnTouch:
 	end;
 }
 
-mid_camp,235,250,3	script	Sage Serpeone	435,2,2,{
+mid_camp,235,250,3	script	Sage Serpeone	4_F_FAIRY,2,2,{
 	mes "[Sage Serpeone]";
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "Finally you are an honorable Rune Knight. I'm happy to help you.";
@@ -1420,7 +1420,7 @@ mid_camp,235,250,3	script	Sage Serpeone	435,2,2,{
 	close;
 }
 
-job3_rune01,114,50,3	script	Rune Knight Velpino	468,{
+job3_rune01,114,50,3	script	Rune Knight Velpino	4_M_KNIGHT_BLACK,{
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "[Rune Knight Velpino]";
 		mes "You still smell like a fledging. Bring honor to the Rune Knights and raise your power...";
@@ -1554,7 +1554,7 @@ job3_rune01,114,50,3	script	Rune Knight Velpino	468,{
 	close;
 }
 
-job3_rune02,38,40,0	script	#RK Test Hidden Portal 1	139,15,15,{
+job3_rune02,38,40,0	script	#RK Test Hidden Portal 1	HIDDEN_WARP_NPC,15,15,{
 	end;
 OnEnable:
 	enablenpc "#RK Test Hidden Portal 1";
@@ -1588,7 +1588,7 @@ OnTouch:
 	}
 }
 
-job3_rune02,1,1,0	script	job_rune_edq#1st_tb	139,{
+job3_rune02,1,1,0	script	job_rune_edq#1st_tb	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#1st_tb";
@@ -1617,7 +1617,7 @@ OnTimer14000:
 	end;
 }
 
-job3_rune02,1,2,0	script	job_rune_edq#1st_tc	139,{
+job3_rune02,1,2,0	script	job_rune_edq#1st_tc	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#1st_tc";
@@ -1653,7 +1653,7 @@ OnTimer305000:
 	end;
 }
 
-job3_rune02,3,10,0	script	job_rune_edq#1st_tcmc	139,{
+job3_rune02,3,10,0	script	job_rune_edq#1st_tcmc	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#1st_tcmc";
@@ -1706,7 +1706,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_rune02,3,11,0	script	job_rune_edq#1st_tcmc2	139,{
+job3_rune02,3,11,0	script	job_rune_edq#1st_tcmc2	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#1st_tcmc2";
@@ -1756,7 +1756,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_rune02,1,10,0	script	job_rune_edq#1st_tcnc	139,{
+job3_rune02,1,10,0	script	job_rune_edq#1st_tcnc	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#1st_tcnc";
@@ -1802,7 +1802,7 @@ OnTimer60000:
 	end;
 }
 
-job3_rune02,34,46,5	script	Captain Tigris#jrt1	470,2,2,{
+job3_rune02,34,46,5	script	Captain Tigris#jrt1	4_M_KNIGHT_SILVER,2,2,{
 	if (job_rune_edq != 4 || $@job_rune_test2 != 0) {
 		donpcevent "job_rune_edq#1st_tcnc::OnUse";
 		end;
@@ -1848,7 +1848,7 @@ OnTimer5000:
 	end;
 }
 
-job3_rune02,43,46,3	script	Rune Knight Lunarea#jrt1	469,2,2,{
+job3_rune02,43,46,3	script	Rune Knight Lunarea#jrt1	4_M_KNIGHT_GOLD,2,2,{
 	if (job_rune_edq != 4 || $@job_rune_test2 != 0) {
 		donpcevent "job_rune_edq#1st_tcnc::OnUse";
 		end;
@@ -1893,7 +1893,7 @@ OnTimer5000:
 	end;
 }
 
-job3_rune02,43,34,1	script	Rune Knight Renoa#jrt1	469,2,2,{
+job3_rune02,43,34,1	script	Rune Knight Renoa#jrt1	4_M_KNIGHT_GOLD,2,2,{
 	if (job_rune_edq != 4 || $@job_rune_test2 != 0) {
 		donpcevent "job_rune_edq#1st_tcnc::OnUse";
 		end;
@@ -1939,7 +1939,7 @@ OnTimer5000:
 	end;
 }
 
-job3_rune02,34,34,7	script	Rune Knight Velpino#jrt1	468,2,2,{
+job3_rune02,34,34,7	script	Rune Knight Velpino#jrt1	4_M_KNIGHT_BLACK,2,2,{
 	if (job_rune_edq != 4 || $@job_rune_test2 != 0) {
 		donpcevent "job_rune_edq#1st_tcnc::OnUse";
 		end;
@@ -1984,7 +1984,7 @@ OnTimer5000:
 	end;
 }
 
-job3_rune02,2,1,0	script	job_rune_edq#3rd_tb	139,{
+job3_rune02,2,1,0	script	job_rune_edq#3rd_tb	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#3rd_tb";
@@ -2013,7 +2013,7 @@ OnTimer14000:
 	end;
 }
 
-job3_rune02,2,2,0	script	job_rune_edq#3rd_tc	139,{
+job3_rune02,2,2,0	script	job_rune_edq#3rd_tc	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#3rd_tc";
@@ -2050,7 +2050,7 @@ OnTimer482000:
 	end;
 }
 
-job3_rune02,2,3,0	script	job_rune_edq#3rd_tc1	139,{
+job3_rune02,2,3,0	script	job_rune_edq#3rd_tc1	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#3rd_tc1";
@@ -2074,7 +2074,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_rune02,2,4,0	script	job_rune_edq#3rd_tc2	139,{
+job3_rune02,2,4,0	script	job_rune_edq#3rd_tc2	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#3rd_tc2";
@@ -2098,7 +2098,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_rune02,2,5,0	script	job_rune_edq#3rd_tc3	139,{
+job3_rune02,2,5,0	script	job_rune_edq#3rd_tc3	HIDDEN_WARP_NPC,{
 	end;
 OnInit:
 	disablenpc "job_rune_edq#3rd_tc3";
@@ -2134,7 +2134,7 @@ OnMyMobDead:
 	end;
 }
 
-sec_in02,34,167,3	script	R.Knight Job Manager	470,1,1,{
+sec_in02,34,167,3	script	R.Knight Job Manager	4_M_KNIGHT_SILVER,1,1,{
 	callfunc "F_GM_NPC";
 	mes "Enter the Password.";
 	next;
@@ -2154,4 +2154,4 @@ sec_in02,34,167,3	script	R.Knight Job Manager	470,1,1,{
 	}
 	close;
 }
-job3_rune01,1,1,3	duplicate(R.Knight Job Manager)	#renshucheck	844
+job3_rune01,1,1,3	duplicate(R.Knight Job Manager)	#renshucheck	CLEAR_NPC