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

1 files changed, 28 insertions, 28 deletions

diff --git a/npc/pre-re/jobs/novice/novice.txt b/npc/pre-re/jobs/novice/novice.txt
index 909ba2d88..2f15fa995 100644
--- a/npc/pre-re/jobs/novice/novice.txt
+++ b/npc/pre-re/jobs/novice/novice.txt
@@ -24,21 +24,21 @@
 //============================================================
 
 // Bulletin Board
-new_1-1,66,114,4	script	Bulletin Board#nv	111,{
+new_1-1,66,114,4	script	Bulletin Board#nv	HIDDEN_NPC,{
 	mes "^FF0000=================================^000000";
 	mes "^FF0000 ^000000 ^E40CAA[Welcome]^CC0000 to ^FF9000Novice^7FFF00 Training ^00FF00Grounds ^E40CAA[Welcome]^FF0000^000000";
 	mes "^FF0000=================================^000000";
 	close;
 }
 
-new_1-1,144,116,2	script	Guard#nv1	105,{
+new_1-1,144,116,2	script	Guard#nv1	8W_SOLDIER,{
 	mes "[Training Grounds Guard]";
 	mes "Welcome to the Training Grounds.";
 	mes "You are now in the outer court yard. Please go inside the castle to begin your training.";
 	close;
 }
 
-new_1-1,144,107,2	script	Guard#nv2	105,{
+new_1-1,144,107,2	script	Guard#nv2	8W_SOLDIER,{
 	mes "[Training Grounds Guard]";
 	if(rand(2)) {
 		mes "Come in!";
@@ -60,7 +60,7 @@ new_1-1,144,107,2	script	Guard#nv2	105,{
 }
 
 // Receptionist
-new_1-2,100,29,4	script	Receptionist#nv1	86,{
+new_1-2,100,29,4	script	Receptionist#nv1	4_M_04,{
 	mes "[Training Grounds Receptionist]";
 	mes "Hello, you look to be new here.";
 	mes "What is your name?";
@@ -177,7 +177,7 @@ new_1-2,100,29,4	script	Receptionist#nv1	86,{
 	}
 }	
 
-new_1-1,53,114,4	script	Shion#nv1	727,{
+new_1-1,53,114,4	script	Shion#nv1	4_F_JOB_HUNTER,{
 	if (nov_get_item04 > 9 || nov_get_item05 > 9) {
 		mes "[Shion]";
 		mes "Hm...?";
@@ -349,7 +349,7 @@ new_1-1,53,114,4	script	Shion#nv1	727,{
 }
 
 // Interfaces Tutor
-new_1-2,99,105,3	script	Interfaces Tutor#nv1	751,{
+new_1-2,99,105,3	script	Interfaces Tutor#nv1	4_M_CRU,{
 	if (nov_get_item02 > 9 && nov_get_item03 > 9 && nov_get_item04 > 9) {
 		mes "[Kris]";
 		mes "You've completed all the essential courses. Have you spoken to the assistant tutors already? The field combat training will be your next course. Would you like to proceed?";
@@ -626,7 +626,7 @@ new_1-2,99,105,3	script	Interfaces Tutor#nv1	751,{
 	}
 }
 
-new_1-2,83,111,3	script	Skill Tutor#nv	753,{
+new_1-2,83,111,3	script	Skill Tutor#nv	4_M_MONK,{
 	if (nov_get_item02 > 9 && nov_get_item03 > 9 && nov_get_item04 > 9) {
 		mes "[Cecil]";
 		mes "Huh...?";
@@ -883,7 +883,7 @@ new_1-2,83,111,3	script	Skill Tutor#nv	753,{
 	}
 }
 
-new_1-2,115,111,3	script	Item Tutor#nv	726,{
+new_1-2,115,111,3	script	Item Tutor#nv	4_F_JOB_BLACKSMITH,{
 	if (nov_get_item02 > 9 && nov_get_item03 > 9 && nov_get_item04 > 9) {
 		mes "[Alice]";
 		mes "Huh...?";
@@ -1231,7 +1231,7 @@ new_1-2,115,111,3	script	Item Tutor#nv	726,{
 	}
 }
 
-new_1-2,118,108,3	script	Kafra Employee#nv1	117,{
+new_1-2,118,108,3	script	Kafra Employee#nv1	4_F_KAFRA1,{
 	mes "[Kafra Employee]";
 	mes "Welcome to";
 	mes "Kafra Corporation.";
@@ -1530,7 +1530,7 @@ new_1-2,118,108,3	script	Kafra Employee#nv1	117,{
 }
 
 //Interface Assistant
-new_1-2,161,182,5	script	Instructor#nv	92,{
+new_1-2,161,182,5	script	Instructor#nv	4_F_03,{
 	mes "[Edwin]";
 	mes "Welcome to my class.";
 	mes "Choose the subject you";
@@ -1699,7 +1699,7 @@ new_1-2,161,182,5	script	Instructor#nv	92,{
 	}
 }
 
-new_1-2,182,182,3	script	Somatology Instructor	754,{
+new_1-2,182,182,3	script	Somatology Instructor	4_M_SAGE_A,{
 	mes "[Jare Riotte]";
 	mes "Welcome, new adventurer.";
 	mes "I, Jare Riotte will help you to learn about the fundamental";
@@ -1890,7 +1890,7 @@ new_1-2,182,182,3	script	Somatology Instructor	754,{
 	}
 }
 
-new_1-2,184,172,1	script	Understandings of Skills	47,{
+new_1-2,184,172,1	script	Understandings of Skills	1_M_01,{
 	mes "[Leo Handerson]";
 	mes "Welcome~";
 	mes "Oh look at this";
@@ -2150,7 +2150,7 @@ new_1-2,184,172,1	script	Understandings of Skills	47,{
 	}
 }
 
-new_1-2,121,101,2	script	Guide Soldier#nv1	105,{
+new_1-2,121,101,2	script	Guide Soldier#nv1	8W_SOLDIER,{
 	mes "[Guide Soldier]";
 	mes "We Guide Soldiers provide location information at the entrance of every town. You can easily find us by our special uniforms.";
 	next;
@@ -2163,7 +2163,7 @@ new_1-2,121,101,2	script	Guide Soldier#nv1	105,{
 	close;
 }
 
-new_1-2,17,182,5	script	Helper#nv	84,{
+new_1-2,17,182,5	script	Helper#nv	4_M_02,{
 	if (nov_2nd_cos < 11) {
 		mes "[Elmeen]";
 		mes "Congratulations!";
@@ -2449,7 +2449,7 @@ new_1-2,17,182,5	script	Helper#nv	84,{
 	}
 }
 
-new_1-2,38,182,3	script	Entrance Guard#nv	92,{
+new_1-2,38,182,3	script	Entrance Guard#nv	4_F_03,{
 	if (nov_2nd_cos == 0) {
 		mes "[Muriel]";
 		mes "I'm sorry, but I can't let anybody who hasn't been instructed on fighting enter the Field Combat Training Grounds.";
@@ -2617,7 +2617,7 @@ new_1-2,38,182,3	script	Entrance Guard#nv	92,{
 }
 
 //Teleport NPC
-new_1-3,95,30,4	script	Trainer#nv1::NovHoffman	84,{
+new_1-3,95,30,4	script	Trainer#nv1::NovHoffman	4_M_02,{
 	mes "[Hoffman]";
 	mes "Hey there~";
 	mes "I'm here to provide";
@@ -2690,12 +2690,12 @@ new_1-3,95,30,4	script	Trainer#nv1::NovHoffman	84,{
 	}
 }
 
-new_2-3,95,30,4	duplicate(NovHoffman)	Trainer#nv2	84
-new_3-3,95,30,4	duplicate(NovHoffman)	Trainer#nv3	84
-new_4-3,95,30,4	duplicate(NovHoffman)	Trainer#nv4	84
-new_5-3,95,30,4	duplicate(NovHoffman)	Trainer#nv5	84
+new_2-3,95,30,4	duplicate(NovHoffman)	Trainer#nv2	4_M_02
+new_3-3,95,30,4	duplicate(NovHoffman)	Trainer#nv3	4_M_02
+new_4-3,95,30,4	duplicate(NovHoffman)	Trainer#nv4	4_M_02
+new_5-3,95,30,4	duplicate(NovHoffman)	Trainer#nv5	4_M_02
 
-new_1-3,96,174,3	script	Test Examiner#nv1::NovKeyman	85,{
+new_1-3,96,174,3	script	Test Examiner#nv1::NovKeyman	4_M_03,{
 	mes "[Keyman]";
 	mes "Good!!";
 	mes "Now you know how to fight";
@@ -2721,15 +2721,15 @@ new_1-3,96,174,3	script	Test Examiner#nv1::NovKeyman	85,{
 	}
 }
 
-new_2-3,96,174,3	duplicate(NovKeyman)	Test Examiner#nv2	85
-new_3-3,96,174,3	duplicate(NovKeyman)	Test Examiner#nv3	85
-new_4-3,96,174,3	duplicate(NovKeyman)	Test Examiner#nv4	85
-new_5-3,96,174,3	duplicate(NovKeyman)	Test Examiner#nv5	85
+new_2-3,96,174,3	duplicate(NovKeyman)	Test Examiner#nv2	4_M_03
+new_3-3,96,174,3	duplicate(NovKeyman)	Test Examiner#nv3	4_M_03
+new_4-3,96,174,3	duplicate(NovKeyman)	Test Examiner#nv4	4_M_03
+new_5-3,96,174,3	duplicate(NovKeyman)	Test Examiner#nv5	4_M_03
 
 //Potato Merchant
-new_1-2,28,185,4	shop	Potato Merchant	90,516:15
+new_1-2,28,185,4	shop	Potato Merchant	4_F_01,516:15
 
-new_1-4,100,29,1	script	Hanson#nv	46,{
+new_1-4,100,29,1	script	Hanson#nv	1_ETC_01,{
 	if (checkweight(909,400) == 0) {
 		mes "[Hanson]";
 		mes "All of the items you are carrying must be quite a burden. Where did you get so much things? Please lighten your weight by getting rid of things you don't need.";
@@ -3961,7 +3961,7 @@ S_UserJobchoice:
 }
 
 //Novice Instructor
-new_1-4,91,22,4	script	Bruce#nv	57,{
+new_1-4,91,22,4	script	Bruce#nv	1_M_LIBRARYMASTER,{
 	if (Class == Job_Novice) {
 		if (nov_3_swordman == 20) {
 			mes "[Bruce]";