Merge branch 'master' of https://github.com/HerculesWS/Hercules into scriptcommand_makeitem2

2 files changed, 108 insertions, 108 deletions

diff --git a/npc/re/jobs/novice/academy.txt b/npc/re/jobs/novice/academy.txt
index 4b970a86c..0d8f3a7e2 100644
--- a/npc/re/jobs/novice/academy.txt
+++ b/npc/re/jobs/novice/academy.txt
@@ -776,7 +776,7 @@ izlude,122,207,3	script	Criatura Academy Staff#0	4_M_KHKYEL,3,3,{
 							mes "<NAVI>[the Academy building]<INFO>iz_ac01,100,39</INFO></NAVI>.";
 							mes "Anybody can enroll, so take advantage of it.";
 							next;
-							emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2);
+							emotion e_gasp, 0, "Information Staff#"+strnpcinfo(NPC_NAME_HIDDEN);
 							mes "[Information Staff]";
 							mes "Sorry to interrupt.";
 							mes "But ^4d4dff if you need location info, please ask me.^000000";
@@ -798,7 +798,7 @@ izlude,122,207,3	script	Criatura Academy Staff#0	4_M_KHKYEL,3,3,{
 							mes "If there are more adventurers like you, the future will be brighter.";
 							mes "Hahahaha.";
 							next;
-							emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2);
+							emotion e_gasp, 0, "Information Staff#"+strnpcinfo(NPC_NAME_HIDDEN);
 							mes "[Information Staff]";
 							mes "Sorry to interrupt.";
 							mes "But ^4d4dff if you need location info, please ask me.^000000";
@@ -817,7 +817,7 @@ izlude,122,207,3	script	Criatura Academy Staff#0	4_M_KHKYEL,3,3,{
 							mes "<NAVI>[the academy building]<INFO>iz_ac01,100,39</INFO></NAVI>.";
 							mes "What is well, is well- isn't it?";
 							next;
-							emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2);
+							emotion e_gasp, 0, "Information Staff#"+strnpcinfo(NPC_NAME_HIDDEN);
 							mes "[Information Staff]";
 							mes "You are correct.";
 							mes "Preperation is the key.";
@@ -852,7 +852,7 @@ izlude,122,207,3	script	Criatura Academy Staff#0	4_M_KHKYEL,3,3,{
 						mes "<NAVI>[the Academy building]<INFO>iz_ac01,100,39</INFO></NAVI>.";
 						mes "Anybody can enroll, so take advantage of it.";
 						next;
-						emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2);
+						emotion e_gasp, 0, "Information Staff#"+strnpcinfo(NPC_NAME_HIDDEN);
 						mes "[Information Staff]";
 						mes "Sorry to interrupt.";
 						mes "But ^4d4dff if you need location info, please ask me.^000000";
@@ -874,7 +874,7 @@ izlude,122,207,3	script	Criatura Academy Staff#0	4_M_KHKYEL,3,3,{
 						mes "If there are more adventurers like you, the future will be brighter.";
 						mes "Hahahaha.";
 						next;
-						emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2);
+						emotion e_gasp, 0, "Information Staff#"+strnpcinfo(NPC_NAME_HIDDEN);
 						mes "[Information Staff]";
 						mes "Sorry to interrupt.";
 						mes "But ^4d4dff if you need location info, please ask me.^000000";
@@ -893,7 +893,7 @@ izlude,122,207,3	script	Criatura Academy Staff#0	4_M_KHKYEL,3,3,{
 						mes "<NAVI>[the academy building]<INFO>iz_ac01,100,39</INFO></NAVI>.";
 						mes "What is well, is well- isn't it?";
 						next;
-						emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2);
+						emotion e_gasp, 0, "Information Staff#"+strnpcinfo(NPC_NAME_HIDDEN);
 						mes "[Information Staff]";
 						mes "You are correct.";
 						mes "Preperation is the key.";
@@ -2108,19 +2108,19 @@ izlude,141,251,0	script	Cultivated Red Plant#0	RED_PLANT,3,3,{
 
 	OnTouch:
 		if (questprogress(7478) == 1 && !questprogress(7479))
-			donpcevent "Cultivated Red Plant#"+strnpcinfo(2)+"::OnDisable";
+			donpcevent "Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnDisable";
 		end;
 
 	OnDisable:
 		specialeffect EF_STEAL;
-		disablenpc "Cultivated Red Plant#"+strnpcinfo(2);
+		disablenpc "Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN);
 		emotion e_gasp, 1;
-		emotion e_heh, 0, "Academy Student#"+strnpcinfo(2);
+		emotion e_heh, 0, "Academy Student#"+strnpcinfo(NPC_NAME_HIDDEN);
 		initnpctimer;
 		end;
 
 	OnTimer30000:
-		enablenpc "Cultivated Red Plant#"+strnpcinfo(2);
+		enablenpc "Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN);
 		stopnpctimer;
 		end;
 }
@@ -2138,8 +2138,8 @@ izlude,140,249,7	script	Academy Student#0	4_M_NOV_RUMIN,{
 		close;
 	}
 	if (questprogress(7478) == 1 && !questprogress(7479)) {
-		specialeffect EF_STEAL, AREA, "Cultivated Red Plant#"+strnpcinfo(2);
-		donpcevent "Cultivated Red Plant#"+strnpcinfo(2)+"::OnDisable";
+		specialeffect EF_STEAL, AREA, "Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN);
+		donpcevent "Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnDisable";
 		emotion e_gasp, 1;
 		emotion e_heh;
 		mes "[Lumin]";
@@ -2200,7 +2200,7 @@ izlude,140,249,7	script	Academy Student#0	4_M_NOV_RUMIN,{
 		next;
 		mes "[Lumin]";
 		mes "Ah... see it's growing back.";
-		enablenpc "Cultivated Red Plant#"+strnpcinfo(2);
+		enablenpc "Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN);
 		close2;
 	} else {
 		if (Class == Job_Novice) {
@@ -3738,11 +3738,11 @@ iz_ac01,147,50,3	script	Dacquoise#ac	4_COOK,{
 			mes "[Dacquoise]";
 			mes "I am Dacquoise, the pupil of the legendary chef of Rune Midgard, ^0000cdCharles Orleans^000000.";
 			next;
-			emotion e_no1, 0, "Eclaire#"+strnpcinfo(2);
+			emotion e_no1, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN);
 			mes "[Eclaire]";
 			mes "And we are also club members of Sir Orleans' ^0000cdfan club- Loverleans^000000.";
 			next;
-			emotion e_lv,"Mille Feuille#"+strnpcinfo(2);
+			emotion e_lv,"Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN);
 			mes "[Mille Feuille]";
 			mes "Orlean belongs to all of us!";
 			next;
@@ -3765,7 +3765,7 @@ iz_ac01,147,50,3	script	Dacquoise#ac	4_COOK,{
 			mes "[Eclaire]";
 			mes "You, do you want to know more about cooking?";
 			next;
-			emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2);
+			emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN);
 			mes "[Mille Feuille]";
 			mes "Will you exeprience the various spectrums of cooking?";
 			next;
@@ -3784,11 +3784,11 @@ iz_ac01,147,50,3	script	Dacquoise#ac	4_COOK,{
 			mes "[Dacquoise]";
 			mes "Ok, we will be kind guides to the journey of cooking!!";
 			next;
-			emotion e_no1, 0, "Eclaire#"+strnpcinfo(2);
+			emotion e_no1, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN);
 			mes "[Eclaire]";
 			mes "It's ok with me, asking me everthing you want to know.";
 			next;
-			emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2);
+			emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN);
 			mes "[Mille Feuille]";
 			mes "Kindness is our spice~";
 			next;
@@ -3848,18 +3848,18 @@ iz_ac01,147,50,3	script	Dacquoise#ac	4_COOK,{
 				mes "[Dacquoise]";
 				mes "Right, cooking needs some preparation. This can also be divided into two catagories.";
 				next;
-				emotion e_gasp,"Dacquoise#"+strnpcinfo(2);
+				emotion e_gasp,"Dacquoise#"+strnpcinfo(NPC_NAME_HIDDEN);
 				break;
 			case 3:
 				emotion e_an;
 				mes "[Dacquoise]";
 				mes "What is this? What a waste of time!";
 				next;
-				emotion e_ag, 0, "Eclaire#"+strnpcinfo(2);
+				emotion e_ag, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN);
 				mes "[Eclaire]";
 				mes "I thought we were going to get more members!";
 				next;
-				emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2);
+				emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN);
 				mes "[Mille Feuille]";
 				mes "Never show up again!!";
 				close;
@@ -3924,11 +3924,11 @@ iz_ac01,147,50,3	script	Dacquoise#ac	4_COOK,{
 					next;
 					mes "[Eclaire]";
 					mes "You have insulted us!";
-					emotion e_ag, 0, "Eclaire#"+strnpcinfo(2);
+					emotion e_ag, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN);
 					next;
 					mes "[Mille Feuille]";
 					mes "Come back again, if you want to learn later~ I guess...";
-					emotion e_dots, 0, "Mille Feuille#"+strnpcinfo(2);
+					emotion e_dots, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN);
 					close2;
 					if(questprogress(14154) == 1)
 						erasequest 14154;
@@ -3951,12 +3951,12 @@ iz_ac01,147,50,3	script	Dacquoise#ac	4_COOK,{
 					next;
 					mes "[Eclaire]";
 					mes "Go hunting after eating this. You will feel your power enhanced.";
-					emotion e_no1, 0, "Eclaire#"+strnpcinfo(2);
+					emotion e_no1, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN);
 					next;
 					mes "[Mille Feuille]";
 					mes "If you really want to cook, go and see ^0000ffSir. Charles Orleans at the basement of Prontera castle^000000!!";
 					mes "Kya... Sir Orleans!!";
-					emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2);
+					emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN);
 					close2;
 					delitem Clover, 1; // Clover
 					delitem Green_Herb, 1; // Green_Herb
@@ -3973,11 +3973,11 @@ iz_ac01,147,50,3	script	Dacquoise#ac	4_COOK,{
 					next;
 					mes "[Eclaire]";
 					mes "Try this. It will make you run like you are a flying bee.";
-					emotion e_no1, 0, "Eclaire#"+strnpcinfo(2);
+					emotion e_no1, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN);
 					next;
 					mes "[Mille Feuille]";
 					mes "If you really want to cook, go and see ^0000ffSir. Charles Orleans at the basement of Prontera castle^000000!! You must be attracted by him!!";
-					emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2);
+					emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN);
 					close2;
 					delitem Apple, 1; // Apple
 					delitem Carrot, 2; // Carrot
@@ -3993,11 +3993,11 @@ iz_ac01,147,50,3	script	Dacquoise#ac	4_COOK,{
 					next;
 					mes "[Eclaire]";
 					mes "Can you feel unknown power coursing through your veins? You're eating it!";
-					emotion e_no1, 0, "Eclaire#"+strnpcinfo(2);
+					emotion e_no1, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN);
 					next;
 					mes "[Mille Feuille]";
 					mes "If you are really curious about the cooking, go seek Sir. Charles Orleans at the basement of Prontera Castle.";
-					emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2);
+					emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN);
 					close2;
 					delitem Jellopy, 1; // Jellopy
 					delitem Fluff, 1; // Fluff
@@ -4015,12 +4015,12 @@ iz_ac01,147,50,3	script	Dacquoise#ac	4_COOK,{
 					mes "[Eclaire]";
 					mes "If you eat this. You will never miss your target!";
 					mes "In fact, never miss the target for level 1!";
-					emotion e_no1, 0, "Eclaire#"+strnpcinfo(2);
+					emotion e_no1, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN);
 					next;
 					mes "[Mille Feuille]";
 					mes "Go and see Sir. Charles Orleans at the basement of Prontera castle!!";
 					mes "You can learn real cooking from him!";
-					emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2);
+					emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN);
 					close2;
 					delitem Apple, 1; // Apple
 					delitem Clover, 1; // Clover
@@ -4056,14 +4056,14 @@ iz_ac01,147,50,3	script	Dacquoise#ac	4_COOK,{
 				mes "[Dacquoise]";
 				mes "Why are you saying you will make them?";
 				next;
-				emotion e_hmm, 0, "Mille Feuille#"+strnpcinfo(2);
+				emotion e_hmm, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN);
 				mes "[Mille Feuille]";
 				mes "Ah, Why not?";
 				next;
 				mes "[Dacquoise]";
 				mes "I am the leader of this flame cooking trio chefs!";
 				next;
-				emotion e_omg, 0, "Eclaire#"+strnpcinfo(2);
+				emotion e_omg, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN);
 				mes "[Eclaire]";
 				mes "What?!! When was that decided?";
 				next;
@@ -4071,11 +4071,11 @@ iz_ac01,147,50,3	script	Dacquoise#ac	4_COOK,{
 				mes "[Dacquoise]";
 				mes "Is there anyone who is older than me?";
 				next;
-				emotion e_omg, 0, "Eclaire#"+strnpcinfo(2);
+				emotion e_omg, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN);
 				mes "[Eclaire]";
 				mes "Age! There is nothing I can do with it.";
 				next;
-				emotion e_ok,"Mille Feuille#"+strnpcinfo(2);
+				emotion e_ok,"Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN);
 				mes "[Mille Feuille]";
 				mes "Just because you're one year older, you want to automatically be rejected. Anyone have an objection?";
 				next;
@@ -4202,11 +4202,11 @@ iz_ac01,147,50,3	script	Dacquoise#ac	4_COOK,{
 			mes "[Dacquoise]";
 			mes "I am Dacquoise, the pupil of the legendary chef of Rune Midgard, ^0000cdCharles Orleans^000000.";
 			next;
-			emotion e_no1, 0, "Eclaire#"+strnpcinfo(2);
+			emotion e_no1, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN);
 			mes "[Eclaire]";
 			mes "Steaks not only increase stats but also recover both your HP and SP.";
 			next;
-			emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2);
+			emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN);
 			mes "[Mille Feuille]";
 			mes "If you really want to cook, go and see^0000cd Sir. Charles Orleans at the basement of Prontera castle^000000!! You must be attracted by him!!";
 			close;
@@ -4474,7 +4474,7 @@ iz_ac01,59,83,3	script	Battle Instructor#08	4_M_NOV_HUNT,{
 					mes "Ok, I'll send you to the West field of Izlude.";
 					mes "Be sure you know how to get back.";
 					close2;
-					warp "prt_fild"+strnpcinfo(2), 344, 213;
+					warp "prt_fild"+strnpcinfo(NPC_NAME_HIDDEN), 344, 213;
 					end;
 				case 3:
 					mes "[Battle Instructor Subino]";
@@ -5484,15 +5484,15 @@ izlude,95,146,5	script	Mom#iz	4_F_CAVE1,{
 	mes "[Mom]";
 	mes "^0000cd[Come to me, honey~]^000000";
 	next;
-	enablenpc "Etinifni#"+strnpcinfo(2);
-	specialeffect EF_PORTAL, AREA, "Etinifni#"+strnpcinfo(2);
+	enablenpc "Etinifni#"+strnpcinfo(NPC_NAME_HIDDEN);
+	specialeffect EF_PORTAL, AREA, "Etinifni#"+strnpcinfo(NPC_NAME_HIDDEN);
 	mes "[Etinifni]";
 	mes "What's up? Where am I?";
 	next;
 	mes "[Mom]";
 	mes "Here!";
 	next;
-	emotion e_ag, 0, "Etinifni#"+strnpcinfo(2);
+	emotion e_ag, 0, "Etinifni#"+strnpcinfo(NPC_NAME_HIDDEN);
 	mes "[Etinifni]";
 	mes "Ah... Again!! I have been out hunting Orcs.";
 	next;
@@ -5505,12 +5505,12 @@ izlude,95,146,5	script	Mom#iz	4_F_CAVE1,{
 	mes "[Mom]";
 	mes "What? This moron?!";
 	next;
-	emotion e_sigh, 0, "Etinifni#"+strnpcinfo(2);
+	emotion e_sigh, 0, "Etinifni#"+strnpcinfo(NPC_NAME_HIDDEN);
 	mes "[Etinifni]";
 	mes "OK. I will do it.";
 	next;
-	disablenpc "Etinifni#"+strnpcinfo(2);
-	emotion e_sob, 0, "Dad#"+strnpcinfo(2);
+	disablenpc "Etinifni#"+strnpcinfo(NPC_NAME_HIDDEN);
+	emotion e_sob, 0, "Dad#"+strnpcinfo(NPC_NAME_HIDDEN);
 	mes "[Dad]";
 	mes "I am sorry... Dad has no power over your mom.";
 	close;
@@ -5549,7 +5549,7 @@ izlude,97,144,1	script	Etinifni#iz	4_M_DEWBOY,{
 	close;
 
 	OnInit:
-		disablenpc "Etinifni#"+strnpcinfo(2);
+		disablenpc "Etinifni#"+strnpcinfo(NPC_NAME_HIDDEN);
 		end;
 }
 
@@ -5571,8 +5571,8 @@ izlude,99,138,3	script	Romantic Male#iz	4_M_SITDOWN,{
 	mes "[Romantic Male]";
 	mes "Are you lifting up our good old memories renting my wedding dress and your tuxedo!! It will strenghthen our relationship, won't it?";
 	next;
-	specialeffect EF_HEARTCASTING, AREA, "Romantic Female#"+strnpcinfo(2);
-	emotion e_kis, 0, "Romantic Female#"+strnpcinfo(2);
+	specialeffect EF_HEARTCASTING, AREA, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN);
+	emotion e_kis, 0, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN);
 	mes "[Romantic Male]";
 	mes "Honey~~ I love you!! Sweetheart~";
 	next;
@@ -5592,7 +5592,7 @@ izlude,97,138,5	script	Romantic Female#iz	4_F_SITDOWN,{
 	mes "[Romantic Female]";
 	mes "Shout like this when I miss you, honey!!";
 	next;
-	emotion e_lv, 0, "Romantic Female#"+strnpcinfo(2);
+	emotion e_lv, 0, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN);
 	mes "[Romantic Female]";
 	mes "^0000cd[I miss you.]^000000";
 	next;
@@ -5605,20 +5605,20 @@ izlude,97,138,5	script	Romantic Female#iz	4_F_SITDOWN,{
 	mes "[Romantic Female]";
 	mes "You are tired of sitting, aren't you?";
 	next;
-	specialeffect EF_HEARTCASTING, AREA, "Romantic Female#"+strnpcinfo(2);
-	emotion e_kis, 0, "Romantic Female#"+strnpcinfo(2);
+	specialeffect EF_HEARTCASTING, AREA, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN);
+	emotion e_kis, 0, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN);
 	mes "[Romantic Female]";
 	mes "My sweetheart!!! I love you!!!";
 	next;
 	mes "[Romantic Male]";
 	mes "Yes, thank you for sharing your SP! You are also tired, aren't you?";
 	next;
-	specialeffect EF_HEARTCASTING, AREA, "Romantic Male#"+strnpcinfo(2);
-	emotion e_kis2, 0, "Romantic Male#"+strnpcinfo(2);
+	specialeffect EF_HEARTCASTING, AREA, "Romantic Male#"+strnpcinfo(NPC_NAME_HIDDEN);
+	emotion e_kis2, 0, "Romantic Male#"+strnpcinfo(NPC_NAME_HIDDEN);
 	mes "[Romantic Male]";
 	mes "My sweetheart!! I love you!!!";
 	next;
-	emotion e_lv, 0, "Romantic Female#"+strnpcinfo(2);
+	emotion e_lv, 0, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN);
 	mes "[Romantic Female]";
 	mes "Kia~ You are Coolest!!!";
 	close;
@@ -6151,7 +6151,7 @@ iz_ac01,159,32,3	script	Hungry Trainee#ac	4_M_SIT_NOVICE,{
 	mes "Wonder when my order will get taken... it's already been an hour...";
 	mes "Look at the helpers lingering on the side...";
 	next;
-	emotion e_an, 0, "Scholarship Trainee#"+strnpcinfo(2);
+	emotion e_an, 0, "Scholarship Trainee#"+strnpcinfo(NPC_NAME_HIDDEN);
 	mes "[Scholarship Trainee]";
 	mes "Ugh... this guy...";
 	mes "I already told you eight hundred times! It's buffet style! Ah!";
@@ -11750,7 +11750,7 @@ iz_ac02,62,139,3	script	Lumin#ac	4_M_NOV_RUMIN,{
 			mes "Lumin changing clothes piece by piece.";
 			specialeffect2 EF_SPHERE;
 			specialeffect2 EF_SPHERE;
-			classchange "Lumin#"+strnpcinfo(2), 4_M_THIEF_RUMIN;
+			classchange "Lumin#"+strnpcinfo(NPC_NAME_HIDDEN), 4_M_THIEF_RUMIN;
 			next;
 			cutin "thf_lumin01.bmp", 2;
 			mes "[Lumin]";
@@ -11764,7 +11764,7 @@ iz_ac02,62,139,3	script	Lumin#ac	4_M_NOV_RUMIN,{
 			close2;
 			specialeffect2 EF_SPHERE;
 			specialeffect2 EF_SPHERE;
-			classchange "Lumin#"+strnpcinfo(2), 4_M_NOV_RUMIN;
+			classchange "Lumin#"+strnpcinfo(NPC_NAME_HIDDEN), 4_M_NOV_RUMIN;
 			cutin "", 255;
 			end;
 		}
@@ -11786,25 +11786,25 @@ iz_ac02,1,1,0	script	#nbacStone01	CLEAR_NPC,{
 	end;
 
 	OnInit:
-		donpcevent "#"+strnpcinfo(2)+"::OnSpawn";
+		donpcevent "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnSpawn";
 		end;
 
 	OnReset:
-		killmonster strnpcinfo(4),"#"+strnpcinfo(2)+"::OnMyMobDead";
-		donpcevent "#"+strnpcinfo(2)+"::OnSpawn";
+		killmonster strnpcinfo(NPC_MAP),"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
+		donpcevent "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnSpawn";
 		end;
 
 	OnMyMobDead:
-		.@dead_num = mobcount(""+strnpcinfo(4)+"", "#"+strnpcinfo(2)+"::OnMyMobDead");
+		.@dead_num = mobcount(""+strnpcinfo(NPC_MAP)+"", "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead");
 		if (.@dead_num < 1)
-			donpcevent "#"+strnpcinfo(2)+"::OnSpawn";
+			donpcevent "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnSpawn";
 		end;
 
 	OnSpawn:
-		monster strnpcinfo(4),59,143,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead";
-		monster strnpcinfo(4),60,143,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead";
-		monster strnpcinfo(4),61,143,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead";
-		monster strnpcinfo(4),62,143,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead";
+		monster strnpcinfo(NPC_MAP),59,143,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
+		monster strnpcinfo(NPC_MAP),60,143,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
+		monster strnpcinfo(NPC_MAP),61,143,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
+		monster strnpcinfo(NPC_MAP),62,143,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
 		end;
 }
 
@@ -11818,25 +11818,25 @@ iz_ac02,1,1,0	script	#nbacStone02	CLEAR_NPC,{
 	end;
 
 	OnInit:
-		donpcevent "#"+strnpcinfo(2)+"::OnSpawn";
+		donpcevent "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnSpawn";
 		end;
 
 	OnReset:
-		killmonster strnpcinfo(4),"#"+strnpcinfo(2)+"::OnMyMobDead";
-		donpcevent "#"+strnpcinfo(2)+"::OnSpawn";
+		killmonster strnpcinfo(NPC_MAP),"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
+		donpcevent "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnSpawn";
 		end;
 
 	OnMyMobDead:
-		.@dead_num = mobcount(""+strnpcinfo(4)+"", "#"+strnpcinfo(2)+"::OnMyMobDead");
+		.@dead_num = mobcount(""+strnpcinfo(NPC_MAP)+"", "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead");
 		if (.@dead_num < 1)
-			donpcevent "#"+strnpcinfo(2)+"::OnSpawn";
+			donpcevent "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnSpawn";
 		end;
 
 	OnSpawn:
-		monster strnpcinfo(4),59,137,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead";
-		monster strnpcinfo(4),60,137,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead";
-		monster strnpcinfo(4),61,137,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead";
-		monster strnpcinfo(4),62,137,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead";
+		monster strnpcinfo(NPC_MAP),59,137,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
+		monster strnpcinfo(NPC_MAP),60,137,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
+		monster strnpcinfo(NPC_MAP),61,137,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
+		monster strnpcinfo(NPC_MAP),62,137,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
 		end;
 }
 
@@ -11850,25 +11850,25 @@ iz_ac02,1,1,0	script	#nbacStone03	CLEAR_NPC,{
 	end;
 
 	OnInit:
-		donpcevent "#"+strnpcinfo(2)+"::OnSpawn";
+		donpcevent "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnSpawn";
 		end;
 
 	OnReset:
-		killmonster strnpcinfo(4),"#"+strnpcinfo(2)+"::OnMyMobDead";
-		donpcevent "#"+strnpcinfo(2)+"::OnSpawn";
+		killmonster strnpcinfo(NPC_MAP),"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
+		donpcevent "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnSpawn";
 		end;
 
 	OnMyMobDead:
-		.@dead_num = mobcount(""+strnpcinfo(4)+"", "#"+strnpcinfo(2)+"::OnMyMobDead");
+		.@dead_num = mobcount(""+strnpcinfo(NPC_MAP)+"", "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead");
 		if (.@dead_num < 1)
-			donpcevent "#"+strnpcinfo(2)+"::OnSpawn";
+			donpcevent "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnSpawn";
 		end;
 
 	OnSpawn:
-		monster strnpcinfo(4),59,131,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead";
-		monster strnpcinfo(4),60,131,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead";
-		monster strnpcinfo(4),61,131,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead";
-		monster strnpcinfo(4),62,131,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead";
+		monster strnpcinfo(NPC_MAP),59,131,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
+		monster strnpcinfo(NPC_MAP),60,131,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
+		monster strnpcinfo(NPC_MAP),61,131,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
+		monster strnpcinfo(NPC_MAP),62,131,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
 		end;
 }
 
@@ -12008,7 +12008,7 @@ iz_ac02,156,169,5	script	Acolyte Leader Alice#2	4_F_ACOLYTE,{
 				mes "[Alice Yisha]";
 				mes "Ask ^ff0000if you want to experience skills of an Acolyte, ask the sister next to you^000000.";
 				mes "Now I am reading an introductory skill.";
-				emotion e_omg, 0, "A Nun#"+strnpcinfo(2);
+				emotion e_omg, 0, "A Nun#"+strnpcinfo(NPC_NAME_HIDDEN);
 				close2;
 				cutin "", 255;
 				end;
@@ -14080,15 +14080,15 @@ new_1-1,53,114,3	script	Training Instructor#1a	4_F_03,{
 	mes "I will send you to Izlude.";
 	close2;
 	erasequest 7117, 7127;
-	if (strnpcinfo(4) == "new_1-1" || strnpcinfo(4) == "new_1-2" || strnpcinfo(4) == "new_1-3" || strnpcinfo(4) == "new_1-4") {
+	if (strnpcinfo(NPC_MAP) == "new_1-1" || strnpcinfo(NPC_MAP) == "new_1-2" || strnpcinfo(NPC_MAP) == "new_1-3" || strnpcinfo(NPC_MAP) == "new_1-4") {
 		.@warp$ = "iz_int";
-	} else if (strnpcinfo(4) == "new_2-1" || strnpcinfo(4) == "new_2-2" || strnpcinfo(4) == "new_2-3" || strnpcinfo(4) == "new_2-4") {
+	} else if (strnpcinfo(NPC_MAP) == "new_2-1" || strnpcinfo(NPC_MAP) == "new_2-2" || strnpcinfo(NPC_MAP) == "new_2-3" || strnpcinfo(NPC_MAP) == "new_2-4") {
 		.@warp$ = "iz_int01";
-	} else if (strnpcinfo(4) == "new_3-1" || strnpcinfo(4) == "new_3-2" || strnpcinfo(4) == "new_3-3" || strnpcinfo(4) == "new_3-4") {
+	} else if (strnpcinfo(NPC_MAP) == "new_3-1" || strnpcinfo(NPC_MAP) == "new_3-2" || strnpcinfo(NPC_MAP) == "new_3-3" || strnpcinfo(NPC_MAP) == "new_3-4") {
 		.@warp$ = "iz_int02";
-	} else if (strnpcinfo(4) == "new_4-1" || strnpcinfo(4) == "new_4-2" || strnpcinfo(4) == "new_4-3" || strnpcinfo(4) == "new_4-4") {
+	} else if (strnpcinfo(NPC_MAP) == "new_4-1" || strnpcinfo(NPC_MAP) == "new_4-2" || strnpcinfo(NPC_MAP) == "new_4-3" || strnpcinfo(NPC_MAP) == "new_4-4") {
 		.@warp$ = "iz_int03";
-	} else if (strnpcinfo(4) == "new_5-1" || strnpcinfo(4) == "new_5-2" || strnpcinfo(4) == "new_5-3" || strnpcinfo(4) == "new_5-4") {
+	} else if (strnpcinfo(NPC_MAP) == "new_5-1" || strnpcinfo(NPC_MAP) == "new_5-2" || strnpcinfo(NPC_MAP) == "new_5-3" || strnpcinfo(NPC_MAP) == "new_5-4") {
 		.@warp$ = "iz_int04";
 	}
 	savepoint .@warp$, 98, 88;
diff --git a/npc/re/jobs/novice/novice.txt b/npc/re/jobs/novice/novice.txt
index fff0dbb13..a20bb81f8 100644
--- a/npc/re/jobs/novice/novice.txt
+++ b/npc/re/jobs/novice/novice.txt
@@ -163,8 +163,8 @@ new_5-1,53,114,3	duplicate(NvSprakkiA)	Sprakki#nv5a	4_F_01
 			mes "^4d4dff- You received a quest 'Novice Training Ground -1' from Sprakki.";
 			mes "Please check the Quest Info Window. -^000000";
 			close2;
-			savepoint strnpcinfo(4),100,100;
-			warp strnpcinfo(4),100,100;
+			savepoint strnpcinfo(NPC_MAP),100,100;
+			warp strnpcinfo(NPC_MAP),100,100;
 			end;
 		case 2:
 			nov_1st_cos = 0;
@@ -218,8 +218,8 @@ new_5-1,53,114,3	duplicate(NvSprakkiA)	Sprakki#nv5a	4_F_01
 		mes "These are the Novice Training Grounds.";
 		mes "I will guide you to the Novice Training Center.";
 		close2;
-		savepoint strnpcinfo(4),100,100;
-		warp strnpcinfo(4),100,100;
+		savepoint strnpcinfo(NPC_MAP),100,100;
+		warp strnpcinfo(NPC_MAP),100,100;
 		end;
 	}
 }
@@ -466,7 +466,7 @@ new_5-2,100,29,4	duplicate(NvSprakkiB)	Sprakki#nv5b	4_F_01
 			mes "I think it's better than seeing you lost and wandering about.";
 			mes "Hahahaha...";
 			close2;
-			warp strnpcinfo(4),41,172;
+			warp strnpcinfo(NPC_MAP),41,172;
 			end;
 		}
 	} else {
@@ -480,7 +480,7 @@ new_5-2,100,29,4	duplicate(NvSprakkiB)	Sprakki#nv5b	4_F_01
 			mes "Sure.";
 			mes "Be careful not to be lost again.";
 			close2;
-			warp "new_"+charat(strnpcinfo(4),4)+"-3",96,21;
+			warp "new_"+charat(strnpcinfo(NPC_MAP),4)+"-3",96,21;
 			end;
 		case 2:
 			mes "[Instructor Brade]";
@@ -488,7 +488,7 @@ new_5-2,100,29,4	duplicate(NvSprakkiB)	Sprakki#nv5b	4_F_01
 			mes "In that case, I will send you to where the Kafra Employee is at.";
 			mes "Use ^4d4dffKafra's Warp Service^000000 to go to town.";
 			close2;
-			warp strnpcinfo(4),41,172;
+			warp strnpcinfo(NPC_MAP),41,172;
 			end;
 		}
 	}
@@ -508,7 +508,7 @@ new_5-2,100,105,3	duplicate(NvBradeA)	Brade#nv5a	4_M_JOB_KNIGHT1
 		mes "[Jinha]";
 		mes "You have to see Instructor Brade first before me. I will send you to Instructor Brade.";
 		close2;
-		warp strnpcinfo(4),100,100;
+		warp strnpcinfo(NPC_MAP),100,100;
 		end;
 	} else if (job_novice_q == 5) {
 		if (getskilllv("NV_FIRSTAID") > 0) {
@@ -577,7 +577,7 @@ new_5-2,100,105,3	duplicate(NvBradeA)	Brade#nv5a	4_M_JOB_KNIGHT1
 			mes "[Jinha]";
 			mes "I will send you to Instructor Brade.";
 			close2;
-			warp strnpcinfo(4),100,100;
+			warp strnpcinfo(NPC_MAP),100,100;
 			end;
 		}
 	} else {
@@ -622,7 +622,7 @@ new_5-2,115,120,3	duplicate(NvJinha)	Jinha#nv5	1_M_ORIENT01
 				mes "I will send you to Instructor Brade.";
 				mes "Instructor Brade will start your basic training.";
 				close2;
-				warp strnpcinfo(4),100,100;
+				warp strnpcinfo(NPC_MAP),100,100;
 				end;
 			case 2:
 				mes "[Chocolat]";
@@ -664,7 +664,7 @@ new_5-2,115,120,3	duplicate(NvJinha)	Jinha#nv5	1_M_ORIENT01
 				mes "Sure.";
 				mes "I will see you later.";
 				close2;
-				warp strnpcinfo(4),100,100;
+				warp strnpcinfo(NPC_MAP),100,100;
 				end;
 			}
 		}
@@ -746,7 +746,7 @@ new_5-2,115,120,3	duplicate(NvJinha)	Jinha#nv5	1_M_ORIENT01
 		mes "Real Combat Training will be given by Instructor Brade. You met him earlier.";
 		mes "I will send you to the Real Combat Training Field.";
 		close2;
-		.@map$ = "new_"+charat(strnpcinfo(4),4)+"-3";
+		.@map$ = "new_"+charat(strnpcinfo(NPC_MAP),4)+"-3";
 		savepoint .@map$,96,21;
 		warp .@map$,96,21;
 		end;
@@ -764,7 +764,7 @@ new_5-2,115,120,3	duplicate(NvJinha)	Jinha#nv5	1_M_ORIENT01
 			mes "[Chocolat]";
 			mes "I will send you to the Real Combat Training Field.";
 			close2;
-			.@map$ = "new_"+charat(strnpcinfo(4),4)+"-3";
+			.@map$ = "new_"+charat(strnpcinfo(NPC_MAP),4)+"-3";
 			savepoint .@map$,96,21;
 			warp .@map$,96,21;
 			end;
@@ -1132,7 +1132,7 @@ new_5-2,36,176,4	duplicate(NvGuide)	Guide#nv5	8W_SOLDIER
 				mes "[Brade]";
 				mes "Ok. I'll send you to the basic course.";
 				close2;
-				warp "new_"+charat(strnpcinfo(4),4)+"-2",100,100;
+				warp "new_"+charat(strnpcinfo(NPC_MAP),4)+"-2",100,100;
 				end;
 			case 2:
 				mes "[Brade]";
@@ -1151,7 +1151,7 @@ new_5-2,36,176,4	duplicate(NvGuide)	Guide#nv5	8W_SOLDIER
 				mes "[Brade]";
 				mes "Ok. I'll send you to Chocolat.";
 				close2;
-				warp "new_"+charat(strnpcinfo(4),4)+"-2",41,172;
+				warp "new_"+charat(strnpcinfo(NPC_MAP),4)+"-2",41,172;
 				end;
 			case 2:
 				mes "[Brade]";
@@ -1184,7 +1184,7 @@ new_5-2,36,176,4	duplicate(NvGuide)	Guide#nv5	8W_SOLDIER
 		job_novice_q = 13;
 		setquest 7122;
 		getitem Novice_Potion,100;
-		savepoint strnpcinfo(4),96,21;
+		savepoint strnpcinfo(NPC_MAP),96,21;
 		next;
 		mes "^4d4dff- You've received a quest from Instructor Brade.";
 		mes "Please check the quest information window. -^000000";
@@ -2308,7 +2308,7 @@ new_5-3,97,50,4	duplicate(NvEden)	Eden Group Officer#nv5	4_F_NOVICE,5,5
 		mes "I see, then let me guide you to another level. Which level do you want to go to?";
 		next;
 		for(.@i = 1; .@i<6; ++.@i) {
-			if (!compare(strnpcinfo(2),"nv"+.@i))
+			if (!compare(strnpcinfo(NPC_NAME_HIDDEN),"nv"+.@i))
 				.@menu$ += "Send me to Level "+.@i;
 			.@menu$ += ":";
 		}
@@ -2439,8 +2439,8 @@ new_5-1,144,107,2	duplicate(NvGuardB)	Guard#nv5b	8W_SOLDIER
 	mes "Well, I will let you out of here.";
 	mes "Go find the instructor, Brade.";
 	close2;
-	savepoint strnpcinfo(4),100,100;
-	warp strnpcinfo(4),100,100;
+	savepoint strnpcinfo(NPC_MAP),100,100;
+	warp strnpcinfo(NPC_MAP),100,100;
 	end;
 }
 new_1-2,161,182,5	duplicate(NvEdwin)	Instructor#nv1	4_F_03