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

1 files changed, 18 insertions, 18 deletions

diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt
index ddcce606c..221828908 100644
--- a/npc/jobs/2-2/monk.txt
+++ b/npc/jobs/2-2/monk.txt
@@ -16,7 +16,7 @@
 //= 2.5 Removed the need for use of 'goto.' [L0ne_W0lf]
 //============================================================
 
-prt_monk,59,247,1	script	Guarding Monk#mk	120,6,2,{
+prt_monk,59,247,1	script	Guarding Monk#mk	2_M_PHARMACIST,6,2,{
 	if (Upper == 1) {
 		mes "[Tohobu]";
 		mes "Hmm? What business do you have here?";
@@ -321,7 +321,7 @@ OnTouch:
 	end;
 }
 
-monk_in,99,58,1	script	Sensei Moohae#mk	60,{
+monk_in,99,58,1	script	Sensei Moohae#mk	1_M_PASTOR,{
 	mes "[Sensei Moohae]";
 	mes "Greetings, you seem to be on a pure path.";
 	mes "Come in, come in, what can I do for you today?";
@@ -901,7 +901,7 @@ monk_in,99,58,1	script	Sensei Moohae#mk	60,{
 	}
 }
 
-prt_monk,251,255,1	script	Touha#mk	79,{
+prt_monk,251,255,1	script	Touha#mk	1_F_PRIEST,{
 	if (MONK_Q >= 10 && MONK_Q < 14) {
 		if (MONK_Q == 10) {
 			mes "[Touha]";
@@ -1680,7 +1680,7 @@ prt_monk,251,255,1	script	Touha#mk	79,{
 	}
 }
 
-prt_monk,57,179,1	script	Boohae#mk	110,{
+prt_monk,57,179,1	script	Boohae#mk	4_M_MINISTER,{
 	if (MONK_Q == 14 && BaseJob == Job_Acolyte) {
 		mes "[Boohae]";
 		mes "...";
@@ -1846,7 +1846,7 @@ prt_monk,57,179,1	script	Boohae#mk	110,{
 	}
 }
 
-prt_monk,199,169,3	script	Door Keeper#mk	746,{
+prt_monk,199,169,3	script	Door Keeper#mk	4_F_MONK,{
 	mes "[Keeper Chorip]";
 	mes "....this place is for those";
 	mes " in testing for becoming a monk.";
@@ -1879,7 +1879,7 @@ prt_monk,199,169,3	script	Door Keeper#mk	746,{
 	}
 }
 
-monk_test,329,61,3	script	Bashu#mk	753,{
+monk_test,329,61,3	script	Bashu#mk	4_M_MONK,{
 	if (MONK_Q > 14 && MONK_Q < 25) {
 		if (MONK_Q == 15) {
 			mes "[Bashu]";
@@ -1930,7 +1930,7 @@ monk_test,329,61,3	script	Bashu#mk	753,{
 	}
 }
 
-monk_test,386,388,4	script	Apprentice Monk#mk	110,{
+monk_test,386,388,4	script	Apprentice Monk#mk	4_M_MINISTER,{
 	mes "[Monk Apprentice]";
 	mes "W... welcome!";
 	mes "Th... this place is for testing the tolerance of monk candidates!";
@@ -1965,7 +1965,7 @@ monk_test,386,388,4	script	Apprentice Monk#mk	110,{
 	close;
 }
 
-monk_test,387,350,0	script	Supervisor#race_monk	45,2,2,{
+monk_test,387,350,0	script	Supervisor#race_monk	WARPNPC,2,2,{
 OnTouch:
 	if (MONK_Q >= 15 && MONK_Q <= 23) {
 		set MONK_Q,MONK_Q+1;
@@ -2023,7 +2023,7 @@ monk_test,387,42,0	duplicate(MonkTrap)	Trap#t_monk7_2	-1,1,0
 monk_test,389,43,0	duplicate(MonkTrap)	Trap#t_monk7_3	-1
 monk_test,389,42,0	duplicate(MonkTrap)	Trap#t_monk7_4	-1
 
-job_monk,225,180,1	script	Hyunmoo#mk	89,{
+job_monk,225,180,1	script	Hyunmoo#mk	4_M_ORIENT02,{
 	if ((countitem(1069) > 0 || countitem(1070) > 0) && (countitem(1069) < 30 || countitem(1070) < 30)) {
 		mes "[Hyunmoo]";
 		mes "You didn't bring enough mushrooms... go get some more.";
@@ -2115,7 +2115,7 @@ job_monk,225,180,1	script	Hyunmoo#mk	89,{
 	}
 }
 
-prt_monk,225,180,1	script	Hyunmoo#mk2	89,{
+prt_monk,225,180,1	script	Hyunmoo#mk2	4_M_ORIENT02,{
 	if (MONK_Q < 25) {
 		mes "[Hyunmoo]";
 		mes "As I see vegetables growing, I feel myself growing within.";
@@ -2156,7 +2156,7 @@ prt_monk,225,180,1	script	Hyunmoo#mk2	89,{
 	}
 }
 
-monk_test,319,139,1	script	Tomoon#mk	52,{
+monk_test,319,139,1	script	Tomoon#mk	1_M_HOF,{
 	if (MONK_Q == 25) {
 		mes "[Tomoon]";
 		mes "Welcome young one.";
@@ -2227,7 +2227,7 @@ monk_test,319,139,1	script	Tomoon#mk	52,{
 	}
 }
 
-monk_test,82,85,1	script	Proctor#mk	95,{
+monk_test,82,85,1	script	Proctor#mk	4_F_SISTER,{
 	mes "[Proctor]";
 	mes "So, are you ready to undergo the spiritual training?";
 	next;
@@ -2319,7 +2319,7 @@ OnDisable:
 	end;
 }
 
-monk_test,166,278,0	script	exit_monk#1	45,1,1,{
+monk_test,166,278,0	script	exit_monk#1	WARPNPC,1,1,{
 OnTouch:
 	mes "[Proctor]";
 	mes "You did well. Please return to Tomoon, he's waiting for you.";
@@ -2334,7 +2334,7 @@ OnTouch:
 	end;
 }
 
-monk_test,88,91,1	script	Proctor#mk2	52,{
+monk_test,88,91,1	script	Proctor#mk2	1_M_HOF,{
 	mes "[Proctor]";
 	mes "So, are you ready to undergo this spiritual training?";
 	next;
@@ -2426,7 +2426,7 @@ OnDisable:
 	end;
 }
 
-monk_test,166,178,0	script	exit_monk#2	45,1,1,{
+monk_test,166,178,0	script	exit_monk#2	WARPNPC,1,1,{
 OnTouch:
 	mes "[Proctor]";
 	mes "You did well. Please return to Tomoon, he's waiting for you.";
@@ -2441,7 +2441,7 @@ OnTouch:
 	end;
 }
 
-monk_test,95,85,1	script	Proctor#btl#3	79,{
+monk_test,95,85,1	script	Proctor#btl#3	1_F_PRIEST,{
 	mes "[Proctor]";
 	mes "So, are you ready to undergo this spiritual training?";
 	next;
@@ -2533,7 +2533,7 @@ OnDisable:
 	end;
 }
 
-monk_test,270,278,0	script	exit_monk#3	45,1,1,{
+monk_test,270,278,0	script	exit_monk#3	WARPNPC,1,1,{
 OnTouch:
 	mes "[Proctor]";
 	mes "You did well. Please return to Tomoon, he's waiting for you.";
@@ -2575,7 +2575,7 @@ OnEnable:
 	end;
 }
 
-monk_test,137,338,1	script	switchreset#monkmonk	79,{
+monk_test,137,338,1	script	switchreset#monkmonk	1_F_PRIEST,{
 	mes "Grrrr...";
 	mes "All monsters in the monk job chance place have been reset.";
 	mes "Timer's activated.";