constant-fied!

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5763 54d463be-8e91-2dee-dedb-b68131a5f0ec

38 files changed, 332 insertions, 306 deletions

diff --git a/npc/jobs/1-1/acolyte.txt b/npc/jobs/1-1/acolyte.txt
index 83c2d6095..e34f7bd4c 100644
--- a/npc/jobs/1-1/acolyte.txt
+++ b/npc/jobs/1-1/acolyte.txt
@@ -20,7 +20,7 @@
 

 // -- Father Mareusis --

 prt_church.gat,184,41,4	script	Father Mareusis	60,{

-	callfunc "F_ToHigh",28,"Acolyte High",32,"High Priest",156,0,0,0,"Father Mareusis";

+	callfunc "F_ToHigh",Job_Acolyte_High,"Acolyte High",Job_High_Priest,"High Priest",156,0,0,0,"Father Mareusis";

 	mes "[Father Mareusis]";

 	if(BaseJob==Job_Novice && job_acolyte_q > 0) goto L_Check;

 	mes "What is it you are looking for?";

@@ -73,7 +73,7 @@ prt_church.gat,184,41,4	script	Father Mareusis	60,{
 			mes "[Father Mareusis]";

 			mes "Lying is a sin my child!";

 			mes "Please come back when you are ready";

-			emotion 19;

+			emotion e_swt2;

 			close;

 

 	M_1:

@@ -162,7 +162,7 @@ L_Novice:
 	if(job_acolyte_q==4) goto QuestOver;

 	if(job_acolyte_q > 0) goto L_Start;

 	mes "Huh..? What brings you here? This is a Very dangerous place for a Novice like you. Please Go back quickly.";

-	emotion 0;

+	emotion e_gasp;

 	close;

 

 L_Start:

@@ -180,7 +180,7 @@ L_Start:
 	next;

 	mes "[Father Rubalkabara]";

 	mes "Besides, I know your generation doesn't like to be lectured by old men like myself. Hahaha...";

-	emotion 18;

+	emotion e_heh;

 	next;

 	mes "[Father Rubalkabara]";

 	mes "But you might have to learn to endure what your elders say, because God loves to teach his children. You will see.";

@@ -199,7 +199,7 @@ L_Start:
 

 	Goback:

 		mes "Hmmm... I do not think you name is on my list of candidates.";

-		emotion 20;

+		emotion e_hmm;

 		next;

 		mes "[Father Rubalkabara]";

 		mes "...... Why don't you go back to the Santuary and check again.";

@@ -221,7 +221,7 @@ L_Novice:
 	if(job_acolyte_q == 5) goto QuestOver;

 	if(job_acolyte_q > 0) goto L_Start;

 	mes "My!! Aren't you a little far from your town?  A novice like you could get hurt.  Please be safe.";

-	emotion 0;

+	emotion e_gasp;

 	close;

 L_Start:

 	mes "Ah, You are one of the Acolyte Applicants. I sincerely welcome you.";

@@ -250,7 +250,7 @@ L_Start:
 		mes "[Mother Marthilda]";

 		mes "Hmm....let's see....";

 		mes "..Well... I can't find your name on the List ....";

-		emotion 20;

+		emotion e_hmm;

 		next;

 		mes "[Mother Marthilda]";

 		mes "I recommend that you to return to the Santuary and Check again.";

@@ -296,14 +296,14 @@ L_Start:
 	next;

 	mes "[Father Yosuke]";

 	mes "Now go back to the Sanctuary and don't forget to carry God's teachings with you where ever you go!";

-	emotion 27;

+	emotion e_go;

 	set job_acolyte_q,6;

 	close;

 

 	Goback:

 		mes "[Father Yosuke]";

 		mes "Interesting.. I can't find your name on my list..";

-		emotion 20;

+		emotion e_hmm;

 		next;

 		mes "[Father Yosuke]";

 		mes "I think you've come here by mistake.";

@@ -312,11 +312,11 @@ L_Start:
 

 	QuestOver:

 		mes "What ? You Have more Business with me?";

-		emotion 1;

+		emotion e_what;

 		next;

 		mes "[Father Yosuke]";

 		mes "Your Divine Quest is complete.  Go back to the Sanctuary Now!";

-		emotion 27;

+		emotion e_go;

 		close;

 }

 

diff --git a/npc/jobs/1-1/archer.txt b/npc/jobs/1-1/archer.txt
index 399aa39cf..87d390105 100644
--- a/npc/jobs/1-1/archer.txt
+++ b/npc/jobs/1-1/archer.txt
@@ -18,7 +18,7 @@
 

 // -- Archer Guildsman -- 

 payon_in02.gat,64,71,4	script	Archer Guildsman	59,{

-	callfunc "F_ToHigh",27,"High Archer",35,"Sniper",147,148,0,0,"Archer Guildsman";

+	callfunc "F_ToHigh",Job_Archer_High,"High Archer",Job_Sniper,"Sniper",147,148,0,0,"Archer Guildsman";

 	mes "[Archer Guildsman]";

 	if(BaseJob==Job_Novice && job_archer_q == 1) goto L_Check;

 	mes "Good Day. How may I help you?";

diff --git a/npc/jobs/1-1/mage.txt b/npc/jobs/1-1/mage.txt
index 7407ac4ae..56a0f58cb 100644
--- a/npc/jobs/1-1/mage.txt
+++ b/npc/jobs/1-1/mage.txt
@@ -19,7 +19,7 @@
 

 // -- Expert Mage -- 

 geffen_in.gat,164,124,4	script	Expert Mage	123,{

-	callfunc "F_ToHigh",26,"High Mage",33,"High Wizard",157,0,0,0,"Expert Mage";

+	callfunc "F_ToHigh",Job_Mage_High,"High Mage",Job_High_Wizard,"High Wizard",157,0,0,0,"Expert Mage";

 	if(BaseJob==Job_Novice && job_magician_q >= 1) goto L_BeMage;

 

 	mes "[Expert Mage]";

@@ -83,7 +83,7 @@ L_BeMage:
 	next;

 	mes "[Expert Mage]";

 	mes "Well it's not perfect but it seems you worked very hard on this so...... alright! I'll let you pass!  You are now officialy qualified to become a mage!";

-	emotion 21;

+	emotion e_no1;

 	next;

 	mes "[Expert Mage]";

 	mes "Abra-kadabra and hocus pocus, turn this young novice into a ^00aa00MAGE^000000!!";

@@ -99,7 +99,7 @@ L_BeMage:
 	callfunc "F_ClearJobVar";		// clears all job variables for the current player

 	mes "[Expert Mage]";

 	mes "'Welcome to My World~ teh hehe.  I've always wanted to say that.  Anyways, congratulations!.  You're one of us now so let's be friends okays!";

-	emotion 18;

+	emotion e_heh;

 	next;

 	mes "[Expert Mage]";

 	mes "Good luck to ya and take care!";

@@ -108,14 +108,14 @@ L_BeMage:
 	L_Retry:

 		mes "I'm sorry but the solution you have is no good.  I'm afraid that you didn't pass the test.  You can try again though.";

 		mes "Let me exlpain the test for you once more okays.";

-		emotion 4;

+		emotion e_swt;

 		next;

 		delitem 1090,1;//Items: Unknown_Test_Tube,

 		goto L_Explain;

 

 	L_NoSol:

 		mes "Where is the solution I asked for?  I'm sorry but I can't check the solution when you don't have it.  Let me remind you what solution you need.";

-		emotion 1;

+		emotion e_what;

 		next;

 		goto L_Explain;

 

@@ -409,7 +409,7 @@ moc_ruins.gat,91,150,5	script	Ponka-Hontas	93,{
 		getitem 1088,1;//Items: Morroc_Solution,

 		mes "Thank you, I think you will be a great mage, you are so generous.";

 		mes "I hope i'll see you soon again here";

-		emotion 21;

+		emotion e_no1;

 		close;

 

 		L0NoT:

@@ -448,7 +448,7 @@ pay_arche.gat,122,100,5	script	Dollshoi	88,{
 		getitem 1089,1;//Items: Payon_Solution,

 		mes "Thank you, I think you will be a great mage, you are so generous.";

 		mes "I hope i'll see you soon again here";

-		emotion 21;

+		emotion e_no1;

 		close;

 

 		L0NoT:

diff --git a/npc/jobs/1-1/merchant.txt b/npc/jobs/1-1/merchant.txt
index a38da60d9..1d155ef64 100644
--- a/npc/jobs/1-1/merchant.txt
+++ b/npc/jobs/1-1/merchant.txt
@@ -20,7 +20,7 @@
 // == Guild NPCs == 

 // -- Mahnsoo --

 alberta_in.gat,53,43,6	script	Chief Mahnsoo	86,{

-	callfunc "F_ToHigh",29,"Merchant High",34,"White Smith",153,154,155,0,"Chief Mahnsoo";

+	callfunc "F_ToHigh",Job_Merchant_High,"Merchant High",Job_Whitesmith,"White Smith",153,154,155,0,"Chief Mahnsoo";

 	mes "[Chief Mahnsoo]";

 	if(BaseJob==Job_Novice && job_merchant_q3 == 4) goto L_MakeMerc;

 	if(BaseJob==Job_Novice && job_merchant_q3 == 3) goto L_GiveRecpt;

@@ -55,7 +55,7 @@ M_Menu:
 				sl_Short1k:	

 					mes "Looks like your a little short on zeny.  Why not make a minimal payment of 500 Zeny first?";

 					mes "You can worry about the rest later.";

-					emotion 4;

+					emotion e_swt;

 					goto sM_Menu;

 					close;

 

@@ -69,7 +69,7 @@ M_Menu:
 				

 				sl_Short500z:

 					mes "Looks like your a little short on zeny.  Come back when you have enough.";

-					emotion 4;

+					emotion e_swt;

 					close;

 

 			m_0End:

@@ -245,7 +245,7 @@ L_GiveRecpt:
 

 L_Back:

 	mes "What are you doing back here?";

-	emotion 1;

+	emotion e_what;

 	next;

 	mes "[Chief Mahnsoo]";

 	mes "You didn't leave yet?";

@@ -289,7 +289,7 @@ L_MakeMerc:
 

 	mes "[Chief Mahnsoo]";

 	mes "Congratulations! You are now one of us, A PROUD MERCHANT!!";

-	emotion 21;

+	emotion e_no1;

 	next;

 	mes "[Chief Mahnsoo]";

 	mes "I am very pleased that you decided to join the Merchant Guild and I hope you will play an active role in Rune Midgards' economy!  The best of luck to you!!";

@@ -306,7 +306,7 @@ L_MakeMerc:
 	L_MemFee:

 		mes "[Chief Mahnsoo]";

 		mes "Um... before I go on... there was the little issue of the Membership Fee if you recall.  I will need the rest of it before I can proceed with your initiation.";

-		emotion 20;

+		emotion e_hmm;

 		next;		           			

 		menu "Pay the remaining 500 Zeny",sM_1a,"...(run away!)...",sM_1b;

 

@@ -322,13 +322,13 @@ L_MakeMerc:
 			sL_NotEnough:

 				mes "[Chief Mahnsoo]";

 				mes "Eh em.... you seem to be a little short.  Now that you've come this far, don't let a little fee impede your progress.  Go forth and do something about it!";

-				emotion 4;

+				emotion e_swt;

 				close;

 

 		sM_1b:

 			mes "[Chief Mahnsoo]";

 			mes "WHAT THE??? Hey come back here! YOU STILL HAVE TO PAY THE FEE!!!!!";

-			emotion 19;

+			emotion e_swt2;

 			close;

 

 L_Failed:

@@ -339,7 +339,7 @@ L_Failed:
 	next;

 	mes "[Chief Mahnsoo]";

 	mes "What a shame, what a shame! HOW could you be so CARLESS??!!  I'm sure Wharehouse Manager Kay has already given you an earfull so I will not go on with anymore critizism.";

-	emotion 32;

+	emotion e_pif;

 	next;

 	mes "[Chief Mahnsoo]";

 	mes "^ff0000"+strcharinfo(0) + "^000000, you have failed in the Merchant License Test!  However...... if you are TRUELY interested in becoming a Merchant, and will work EXTREMELY HARD to do so....";

@@ -357,7 +357,7 @@ L_Failed:
 	M_NoThanks:

 		mes "[Chief Mahnsoo]";

 		mes "Remeber these words: In life, failure is NOT an option!!!";

-		emotion 0;

+		emotion e_gasp;

 		set job_merchant_q,0;

 		set job_merchant_q2,0;

 		set job_merchant_q3,0;

@@ -528,7 +528,7 @@ L_Check:
 		mes "[Wharehouse Manager Kay]";

 		mes "Great! Everything went perfectly! I will send my evaluation of your performance to 'Chief Mahnsoo' imiediately.";

 		mes "Go ahead and speak with Chief Mahnsoo so that he can finalize the process to make you a Merchant.";

-		emotion 21;

+		emotion e_no1;

 		set job_merchant_q3,4;

 		close;

 	L_LostRecpt:

@@ -536,17 +536,17 @@ L_Check:
 		next;

 		mes  "[Wharehouse Manager Kay]";

 		mes "YOU HAVE NO RECIEPT?????";

-		emotion 23;

+		emotion e_omg;

 		next;

 		mes "[Wharehouse Manager Kay]";

 		mes "HOW the HECK am I gonna know that you delievered it then?  This was an ABSOLUTE FAILURE!!";

 		mes "Your evaluation is not going to look good.  I suggest you find some good excuses by the time you speak with Chief Mahnsoo.";

-		emotion 32;

+		emotion e_pif;

 		set job_merchant_q3,5;

 		close;

 	L_WrongProd:

 		mes "You delivered the WRONG PRODUCT??? DO YOU know how much TIME you've WASTED???? UCK! This was a total failure!";

-		emotion 6;

+		emotion e_an;

 		next;

 		mes "[Wharehouse Manager Kay]";

 		mes "Your evaluation is not going to look good.  I suggest you find some good excuses when you go to speak with Chief Mahnsoo.";

@@ -560,14 +560,14 @@ L_Check:
 L_Back:

 	if((countitem(1081) != 1) && (countitem(1082) != 1) && (countitem(1083) != 1)) goto L_LostProd;//Items: Delivery_Box, Delivery_Box_, Delivery_Box__,

 	mes "Huh? Back so soon? Don't tell me you ran into problems already....";

-	emotion 20;

+	emotion e_hmm;

 	next;

 	menu "Please Exchange the Product.",M_Exch,"Nope, never mind.",M_Nvmnd;

 

 	M_Exch:

 		mes "[Wharehouse Manager Kay]";

 		mes "Sigh... this is not a good way to start your test you know.  Make sure you get the RIGHT Product this time!  ";

-		emotion 32;

+		emotion e_pif;

 		if(countitem(1081) ==1) delitem 1081,1;//Items: Delivery_Box,

 		if(countitem(1082) ==1) delitem 1082,1;//Items: Delivery_Box_,

 		if(countitem(1083) ==1) delitem 1083,1;//Items: Delivery_Box__,

@@ -583,15 +583,15 @@ L_Back:
 		next;

 		mes "[Wharehouse Manager Kay]";

 		mes "WHAT???";

-		emotion 1;

+		emotion e_what;

 		next;

 		mes "[Wharehouse Manager Kay]";

 		mes "Holy crap!! YOU LOST the product??!! What have you done, you moron!!!";

-		emotion 23;

+		emotion e_omg;

 		next;

 		mes "[Wharehouse Manager Kay]";

 		mes "Your evaluation is not going to look good.  I suggest you find some good excuses when you go to speak with Chief Mahnsoo.";

-		emotion 7;

+		emotion e_ag;

 		set job_merchant_q3,5;

 		close;

 

@@ -638,7 +638,7 @@ function	script	F_MercKafra	{
 		if(countitem(1072) == 1) goto L_Msg;//Items: Delivery_Message,

 		mes "[Kafra]";

 		mes "Thanks so much for comming all this way to deliver the product to me.  Take care now.  By bye.";

-		emotion 15;

+		emotion e_thx;

 		cutin "kafra_03",255;

 		close;

 

@@ -646,11 +646,11 @@ function	script	F_MercKafra	{
 			mes "[Kafra]";

      			mes "Oh,My good Lord! Mr. Mansoo wrote me a Letter? Thank you, Thank you~";

      			mes "I though he would send one, one of these days, but I've never expected it would be at a time like this.....";

-			emotion 1;

+			emotion e_what;

 			next;

 			mes "[Kafra]";

 			mes "I really appreciate what you've done for me.  Here is a small gift to show you my thanks.";

-			emotion 15;

+			emotion e_thx;

 			delitem 1072,1;//Items: Delivery_Message,

 			set @TEMP,rand(2);

 			if(@TEMP !=0) goto R1;

@@ -667,20 +667,20 @@ function	script	F_MercKafra	{
 

 L_NoProd:

 	mes ".... I thought we what we ordered was OVERSIZED and HEAVY.... but.... you seem to carry it on without any difficulty.........";

-	emotion 1;

+	emotion e_what;

 	cutin "kafra_03",255;

 	close;

 

 L_WrongProd:

 	mes "......? Excuse me! I think you gave me the wrong item.  Our order should have the serial number 3318702 or 3543625...";

-	emotion 4;

+	emotion e_swt;

 	set job_merchant_q3,2;

 	cutin "kafra_03",255;

 	close;

 

 L_WrongDest:

 	mes "......? Excuse me.... I think you have the wrong person.... our order should have the serial number 3318702 or 3543625...";

-	emotion 4;

+	emotion e_swt;

 	cutin "kafra_03",255;

 	close;

 }

@@ -726,7 +726,7 @@ L_Other:
 	M_End:

 		mes "[Kafra]";

 		mes "Thank you for using Kafra Corp. Services.  We will be with you wherever you go.";

-		emotion 15;

+		emotion e_thx;

 		cutin "kafra_03",255;

 		close;

 

@@ -765,27 +765,27 @@ L_Start:
 	L_3:

 		mes "[Kafra]";

 		mes "Thank you again for the delivery.";

-		emotion 15;

+		emotion e_thx;

 		cutin "kafra_03",255;

 		close;

 

 L_NoProd:

 	mes "Umm......... excuse me... but where is the Product  your supposed to give me....?";

-	emotion 20;

+	emotion e_hmm;

 	cutin "kafra_03",255;

 	close;

 

 L_WrongProd:

 	mes "Oh, Dear... this isn't what I ordered.  It should have a serial number of either ^ff00002485741 or 2328137^000000.";

 	mes "It looks like there was a mix up at the wharehouse and you got the wrong product.  I'd appreciate it if you could sort this out.";

-	emotion 4;

+	emotion e_swt;

 	set job_merchant_q3,2;

 	cutin "kafra_03",255;

 	close;

 

 L_WrongDest:

 	mes "Oh, Dear... this isn't what I ordered.  You see here, it's addressed to someone else.  It looks like this Product is supposed to go to someone else.";

-	emotion 4;

+	emotion e_swt;

 	cutin "kafra_03",255;

 	close;

 }

@@ -841,23 +841,23 @@ L_Start:
 	L_3:

 		mes "[Guild Staff]";

 		mes "Heheh~ Thank you, Bye Bye.";

-		emotion 15;

+		emotion e_thx;

 		close;

 L_NoProd:

 	mes "Huh? Where? Where is the Box?";

-	emotion 1;

+	emotion e_what;

 	close;

 

 L_WrongDest:

 	mes "Hey wait a Minute! This is not what we ordered! The Serial Number should either be 2989396 or 2191737.";

 	mes "It looks like this is addressed to someone else.  I think you got the wrong delivery destination.";

-	emotion 19;

+	emotion e_swt2;

 	close;

 

 L_WrongProd:

 	mes "Hey wait a Minute! This is not what we ordered! The Serial Number should either be 2989396 or 2191737.";

 	mes "I don't know how you could make this mistake but please correct it.  I really need that Product.";

-	emotion 19;

+	emotion e_swt2;

 	set job_merchant_q3,2;

 	close;

 }

@@ -909,31 +909,31 @@ L_Start:
 	L_3:

 		mes "[Dyer's Student]";

 		mes "Thank you, See you next time~";

-		emotion 15;

+		emotion e_thx;

 		close;

 

 L_NoProd:

 	mes "But where's the Product?";

-	emotion 20;

+	emotion e_hmm;

 	close;

 

 L_WrongProd:

 	mes "Um..... excuse me? I don't think this is what we ordered? The Serial Number should be either 3012685 or 3487372.";

-	emotion 20;

+	emotion e_hmm;

 	next;

 	mes "[Dyer's Student]";

 	mes "I see.  There was a mix up at the wharehouse and you got the wrong product.";

 	next;

 	mes "[Dyer's Student]";

 	mes "Well this sucks.  Please come back with the correct Product.";

-	emotion 32;

+	emotion e_pif;

 	set job_merchant_q3,2;

 	close;	

 

 L_WrongDest:

 	mes "Um.... excuse me? I don't think this is what we ordered? The Serial Number should be either 3012685 or 3487372.";

 	mes "I think you have the wrong delivery destination.  Maybe you should try someone else.";

-	emotion 20;

+	emotion e_hmm;

 	close;

 

 

diff --git a/npc/jobs/1-1/swordman.txt b/npc/jobs/1-1/swordman.txt
index bba2e838c..fb6506955 100644
--- a/npc/jobs/1-1/swordman.txt
+++ b/npc/jobs/1-1/swordman.txt
@@ -55,7 +55,7 @@ izlude_in.gat,62,170,0	script	w1039	45,1,1,{
 // == Npcs ==

 // -- Master Swordsman --

 izlude_in.gat,74,172,5	script	Master Swordsman	119,{

-	callfunc "F_ToHigh",25,"Swordman High",31,"Lord Knight",144,145,146,0,"Master Swordsman";

+	callfunc "F_ToHigh",Job_Swordman_High,"Swordman High",Job_Lord_Knight,"Lord Knight",144,145,146,0,"Master Swordsman";

 	mes "[Master Swordsman]";

 	if(BaseJob==Job_Novice && job_sword_q == 2) goto L_Done;

 	mes "Welcome to the Swordsman Association! So.. What business brings you to us?";

@@ -119,7 +119,7 @@ L_Menu:
 		mes "[Master Swordsman]";

 		mes "Aside from this, in my personal opinion, being a 'Swordsman' is greatest job in all the land!";

 		mes "Muhahahah!!!";

-		emotion 18;

+		emotion e_heh;

 		goto L_Menu;

 

 	M_2:

@@ -149,13 +149,13 @@ L_Menu:
 		O_2b:

 			mes "[Master Swordsman]";

 			mes "....but you're already a Swordsman...????";

-			emotion 20;

+			emotion e_hmm;

 			close;

 					

 	M_End:

 		mes "[Master Swordsman]";

 		mes "Enjoy your youth before you lose it~~ Muhahahaha!!!!";

-		emotion 18;

+		emotion e_heh;

 		close;

 

 L_Done:

@@ -197,11 +197,11 @@ OnStart:
 

 L_Other:

 	mes "Who might you be?! Those who are not Novices are not permitted to go in! Please leave.";

-	emotion 1;

+	emotion e_what;

 	close;

 L_Sword:

 	mes "You're already a Swordsman!! You don't need to take this silly test!";

-	emotion 0;

+	emotion e_gasp;

 	close;

 

 L_Novice:

@@ -211,7 +211,7 @@ L_Novice:
 		mes "Halt! Do you want to take the Swordsman Test?";

 		mes "If so, please fill out the swordsman application first.";

 		mes "Speak with the 'Master Swordsman' for more information.";

-		emotion 0;

+		emotion e_gasp;

 		close;

 

 	L_Start:

diff --git a/npc/jobs/1-1/thief.txt b/npc/jobs/1-1/thief.txt
index 11ad20913..3f34947a1 100644
--- a/npc/jobs/1-1/thief.txt
+++ b/npc/jobs/1-1/thief.txt
@@ -49,7 +49,7 @@ M_Menu:
 		next;

 		mes "[Thief Guide]";

 		mes "Hahahaha... I can still remember the look on that guy's face...";

-		emotion 18;

+		emotion e_heh;

 		next;

 		mes "[Thief Guide]";

 		mes "But anyways... I assume you're here to become a thief...";

@@ -61,7 +61,7 @@ M_Menu:
 		sM_0b:

 			mes "[Thief Guide]";

 			mes "Wow... thanks... now get the HELL OUTA HERE!!";

-			emotion 6;

+			emotion e_an;

 			close;

 		sM_0c:

 			mes "[Thief Guide]";

@@ -77,7 +77,7 @@ M_Menu:
 	M_End:

 		mes "[Thief Guide]";

 		mes "Must you people keep wasting my time!!?";

-		emotion 32;

+		emotion e_pif;

 		close;

 

 	L_Test:

@@ -129,7 +129,7 @@ M_Menu:
 		next;

 		mes "[Thief Guide]";

 		mes "   If you don't have any questions... then GET moving!";

-		emotion 27;

+		emotion e_go;

 		set job_thief_q,1;

 		close;

 

@@ -145,32 +145,32 @@ M_Menu:
 			mes "[Thief Guide]";

 			mes "..... What are you doing here? You're supposed to be gathering mushrooms remember??";

 			mes "Don't tell me you forget what to do??? Jeeze... do you want me to explain it to you one more time?......";

-			emotion 20;

+			emotion e_hmm;

 			next;

 			menu "Heh.. yeah I guess..",sM_1a, "Nope.",sM_1b;

 

 			sM_1a:

 				mes "[Thief Guide]";

 				mes "(~sigh~) There's always someone who gets left behind.... This is the last time so listen CAREFULLY!!....";

-				emotion 32;

+				emotion e_pif;

 				next;

 				goto L_Explain;

 			sM_1b:

 				mes "[Thief Guide]";

 				mes ".... Then what is it??? Do you have something to tell me? YOUR the one who came TO ME...";

 				mes "What... you wanna a piece of me?? HUH!!??";

-				emotion 7;

+				emotion e_ag;

 				close;

 

 		sL_1:

 			mes "[Thief Guide]";

 			mes "What? You actually went and stole some mushrooms?? Are you some kinda idiot?";

 			mes "Haha... I can't believe you listened to me..... ";

-			emotion 1;

+			emotion e_what;

 			next;

 			mes "[Thief Guide]";

 			mes ".... Psych!! Just kidding... heheheh! Speak with the guy next to me about rating the mushrooms you swiped.";

-			emotion 18;

+			emotion e_heh;

 			close;

 

 	L_1:

@@ -185,7 +185,7 @@ M_Menu:
 			next;

 			mes "[Thief Guide]";

 			mes "...... You won't take my place, will you? If you have any ambition like that, I will kick your ^ff0000'ASS OUT OF YOUR BUTT'^000000!";	//this is just too much lol.

-			emotion 0;

+			emotion e_gasp;

 			next;

 			mes "[Thief Guide]";

 			mes "   Still, in order to pass the test you need to go get some mushrooms.";

@@ -196,21 +196,21 @@ M_Menu:
 			next;

 			mes "[Thief Guide]";

 			mes "   Eeewww! Yuuuckk! Still, in order to pass the test you need to go get some mushrooms.";

-			emotion 16;

+			emotion e_wah;

 			close;

 }

 

 

 // -- Test Grader --

 moc_prydb1.gat,42,133,2	script	Comrade Brad	118,{

-	callfunc "F_ToHigh",30,"Thief High",36,"Assassin Cross",149,150,151,152,"Brad";

+	callfunc "F_ToHigh",Job_Thief_High,"Thief High",Job_Assassin_Cross,"Assassin Cross",149,150,151,152,"Brad";

 	if(BaseJob == 0) goto L_Novice;

 	if(BaseJob == 6) goto L_Thief;

 

 L_Other:

 	mes "[Brad]";

 	mes "Hey~ Hey~!! You don't look like a Thief.  What the heck? You'd BETTER NOT be trying to start someting on THIEF TERRITORY!!";

-	emotion 23;

+	emotion e_omg;

 	close;

 L_Thief:

 	mes "[Brad]";

@@ -263,7 +263,7 @@ L_4:
 	L_Final:

 		mes "[Comrade Brad]";

 		mes "Congratulations ^ff0000"+strcharinfo(0)+"^000000, you passed the official Thief Test!  You can now become a Thief!!";

-		emotion 21;

+		emotion e_no1;

 		next;

 		if(SkillPoint > 0) goto sL_SkPoint;

 		delitem 1069, countitem(1069);//Items: Orange_Net_Mushroom,

@@ -283,7 +283,7 @@ L_4:
 		mes "[Comrade Brad]";

 		mes "However, If you bring disgrace to our Guild, or ever betray us, we will not hesitate to have you......";

 		mes "how shall I say..... ^ff0000'REMOVED'^000000 from the Thief Guild.";

-		emotion 29;

+		emotion e_gg;

 		next;

 		mes "[Comrade Brad]";

 		mes "Good luck and always remeber the ^0000cc'Thief Motto'^000000: ^ff0000DON'T Get Caught^000000l!";

@@ -333,18 +333,18 @@ L_Other:
 		mes "[Irrelevent Man]";

 		mes "Hey!! DON'T LOOK AT ME like that! I'M NOT some WACKO okay!!!";

 		set @s_flag, @s_flag+1;

-		emotion 6;

+		emotion e_an;

 		close;

 	L_1e:

 		mes "[Irrelevant Man]";

 		mes "Dude! I got nothin to say with you!  Mind your own business!  Sheesh!!";

-		emotion 32;

+		emotion e_pif;

 		close;

 

 L_Thief:

 	mes "[Irrelevant Man]";

 	mes "Yah Hoo! Look at you! You became a Kool Thief!";

-	emotion 21;

+	emotion e_no1;

 	next;

 	mes "[Irrelevant Man]";

 	mes "Don't worry about Shibu's Farm.  Let the newbies handle that.  Why don't ya go out and kill some stronger monsters.";

@@ -396,7 +396,7 @@ L_2:
 L_3:

 	mes "[Irrelevant Man]";

 	mes "Muhahahaha~~ WHAT???~~ You HAVEN'T PASSED the Test yet? Are you some sort of Idiot!! Kakakaka!!";

-	emotion 18;

+	emotion e_heh;

 	next;

 	mes "[Irrelevant Man]";

 	mes "Just kidding..... NOT!!.  Anywho I'll let ya back in!";

diff --git a/npc/jobs/1-1e/taekwon.txt b/npc/jobs/1-1e/taekwon.txt
index 00fb1d502..f26ed866f 100644
--- a/npc/jobs/1-1e/taekwon.txt
+++ b/npc/jobs/1-1e/taekwon.txt
@@ -42,7 +42,7 @@ payon.gat,146,87,7	script	Taekwon	764,{
 		

 	}

 	mes "Good day. I'm a Taekwon Guild Master.";

-	emotion 1;

+	emotion e_what;

 	close;

 

 L_Check:

diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt
index fbf64e9bb..88b5b5186 100644
--- a/npc/jobs/2-1/assassin.txt
+++ b/npc/jobs/2-1/assassin.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= kobra_k88

 //===== Current Version: ===================================== 

-//= 1.6

+//= 2.0

 //===== Compatible With: ===================================== 

 //= eAthena RC4

 //===== Description: ========================================= 

@@ -25,6 +25,7 @@
 //= 1.6 Added a func which prevent advanced classes passing

 //= 2nd Job Quests again. It also guides adv classes where

 //= to go. [Lupus]

+//= 2.0 Changed numbers to constants. [Vicious]

 //============================================================ 

 

 

@@ -34,7 +35,7 @@
 //****************************************************************************//

 

 in_moc_16.gat,19,33,4	script	Guildsman	55,{

-	callfunc "F_BlockHigh",30,"Thief High",36,"Assassin Cross","Assassin Huey";

+	callfunc "F_BlockHigh",Job_Thief_High,"Thief High",Job_Assassin_Cross,"Assassin Cross","Assassin Huey";

 

 	if(BaseJob==Job_Thief) goto L_Thief;

 	callfunc "Ass_check";

@@ -42,7 +43,7 @@ in_moc_16.gat,19,33,4	script	Guildsman	55,{
 L_Thief:

 	if(JobLevel >= 40) goto L_Start;

 	mes "Hmm? What brings you here?.... I don't think I like the way you're looking at me....?!";

-	emotion 1;

+	emotion e_what;

 	next;

 	mes "[Angry looking man]";

 	mes ".... Hmm.... You're not qualified yet.  To become an Assassin you will have to meet our expectations.";

@@ -56,7 +57,7 @@ L_Start:
 	if(ASSIN_Q == 2) goto L_Failed2;

 	if(ASSIN_Q == 4) goto L_Change;

 	mes ".... A Thief huh?..... And a well trained one at that, cause I can't seem to find my wallet!";

-	emotion 18;

+	emotion e_heh;

 	next;

 	mes "[Angry looking man]";

 	mes "We need people like you, you know........ So how about taking the next step in the world of crime, and become an Assassin?";

@@ -111,7 +112,7 @@ L_Change:
 	next;

 	mes "[Assassin Huey]";

 	mes "Congratulations! After all of your hard work, you can finally become an Assassin!";

-	emotion 21;

+	emotion e_no1;

 	next;

 	mes "[Assassin Huey]";

 	mes "Very well done, you are now offically an Assassin.  Although you are free to visit us at anytime..............";

@@ -228,7 +229,7 @@ OnTouch:
 	M_No:

 		mes "[Assassin Kai]";

 		mes "Huh?? You don't?........";

-		emotion 1;

+		emotion e_what;

 		next;

 		mes "[Assassin Kai]";

 		mes "Are you trying to play games with me??";

@@ -251,22 +252,22 @@ OnTouch:
 

 L_Failed:

 	mes "Ehhh? Weren't you just here a minute ago?";

-	emotion 1;

+	emotion e_what;

 	next;

 	mes "[Assassin Kai]";

 	mes "What's this?..... You failed the first test?";

 	next;

 	mes "[Assassin Kai]";

 	mes "HAHAHAHAAHAHAHAHA!!!!";

-	emotion 18;

+	emotion e_heh;

 	next;

 	mes "[Assassin Kai]";

 	mes "Hehe...HAHA...~cough~..Damn.... It's been a long time since I've met a looser like you..... Ha Ha....";

-	emotion 18;

+	emotion e_heh;

 	next;

 	mes "[Assassin Kai]";

 	mes "Oh...sorry for laughing in your face like this.... but it's just too funny... hahahehehe....";

-	emotion 18;

+	emotion e_heh;

 	next;

 	mes "[Assassin Kai]";

 	mes "So..... do you need me to give you any hints?";

@@ -276,14 +277,14 @@ L_Failed:
 		mes "[Assassin Kai]";

 		mes "Hahaahhaha!!! Well at least you're honest.....";

 		mes "Haha....My stomach...ouch... my stomach hurts!! You're killing me! Hahahaha!!!";

-		emotion 18;

+		emotion e_heh;

 		next;

 		mes "[Nameless One]";

 		mes ".....Hahaha.";

 		next;

 		mes "[Assasin Kai]";

 		mes "HAHAHAHA!! Nameless One, you think its funny too?";

-		emotion 18;

+		emotion e_heh;

 		next;

 		mes "[Nameless One]";

 		mes "Hehehe..... yes very.....";

@@ -311,7 +312,7 @@ L_Failed:
 		next;

 		mes "[Assassin Kai]";

 		mes "Hahaha.... I can't beleive this..... hahaha.....";

-		emotion 18;

+		emotion e_heh;

 		close2;

 		warp "in_moc_16.gat", 19, 141;

 		end;

@@ -381,18 +382,18 @@ L_Failed:
 		sM_End:

 			mes "[Assassin Kai]";

 			mes ".... Hmf... how can you be such an idiot??? You couldn't understand what I was talking about??";

-			emotion 23;

+			emotion e_omg;

 			next;

 			mes "[Assassin Kai]";

 			mes "Is an Assassin's honor that hard to comprehend?!";

 			next;

 			mes "[Assassin Kai]";

 			mes "Grrrrr!!! You're probably going to be a moron all of your life...........";

-			emotion 6;

+			emotion e_an;

 			next;

 			mes "[Assassin Kai]";

 			mes "GET OUT! Get out of here right now!! You're not fit to become an Assassin!!!";

-			emotion 32;

+			emotion e_pif;

 			close2;

 			warp "c_tower4.gat", 64, 76;

 			close;

@@ -1028,7 +1029,7 @@ in_moc_16.gat,21,165,4	script	Barcardi	725,{
 		next;

 		mes "[Barcardi]";

 		mes "....... Oh, and don't forget to bring some courage with you loser!";

-		emotion 32;

+		emotion e_pif;

 		next;

 		warp "moc_fild16.gat", 206, 241;

 		close;

diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt
index e18701989..cbaae1c8c 100644
--- a/npc/jobs/2-1/blacksmith.txt
+++ b/npc/jobs/2-1/blacksmith.txt
@@ -7,7 +7,7 @@
 //= Optimized and further edited by kobra_k88.

 //= Further bugfixed and tested by Lupus

 //===== Current Version: =====================================

-//= 1.8b

+//= 2.0

 //===== Compatible With: =====================================

 //= eAthena  1.0+

 //===== Description: =========================================

@@ -24,13 +24,14 @@
 //= to go. [Lupus]

 //= 1.7 item quantity/ids typos fix

 //= 1.8 Moved the Quest to Einbroch [Poki#3]

+//= 2.0 Changed numbers to constants. [Vicious]

 ==============================================================

 

 

 

 //<==================================================== Blacksmith Altiregen (Job changer)==================================================>\\

 ein_in01.gat,18,28,4	script	Guildsman Altiregen	731,{

-	callfunc "F_BlockHigh",29,"Merchant High",34,"White Smith","Blacksmith Altiregen";

+	callfunc "F_BlockHigh",Job_Merchant_High,"Merchant High",Job_Whitesmith,"White Smith","Blacksmith Altiregen";

 

 	if (BaseJob == 5) goto L_Merc;

 	mes "[Blacksmith Altiregen]";

@@ -87,7 +88,7 @@ L_Merc:
 		sL_HighLvl:

 			mes "[Blacksmith Altiregen]";

 			mes "Wow! I'm impressed! You've done a lot of training there.  You know what they say, with hard work comes great rewards.";

-			emotion 1;

+			emotion e_what;

 			next;

 			mes "[Blacksmith Altiregen]";

 			mes "Well, first things first..... The guildsman ^5533FFGeshupenschte in Einbech^000000, is a bit short on help.";

@@ -114,7 +115,7 @@ L_Merc:
 

 L_Test1:

 	mes "You didn't leave yet? I told you to go see Geshupenschte in Einbech. See you then.";

-	emotion 1;

+	emotion e_what;

 	close;

 

 L_Test2and3:

@@ -141,16 +142,16 @@ L_Test4:
 	M_dontgo:

 		mes "[Blacksmith Altiregen]";

 		mes "What!? You're giving up!?!.........";

-		emotion 1;

+		emotion e_what;

 		next;

 		mes "[Blacksmith Altiregen]";

 		mes "HOW DARE YOU INSULT OUR GUILD LIKE THAT!";

 		mes "Leave now! Don't you dare even DREAM about becoming a blacksmith!";

-		emotion 23;

+		emotion e_omg;

 		next;

 		mes "[Blacksmith Altiregen]";

 		mes "Can't endure ANYTHING can you!? How do you plan to become a blacksmith if you can't do these simple tasks!?";

-		emotion 6;

+		emotion e_an;

 		close;

 

 	L_NotDone:	

@@ -175,7 +176,7 @@ L_Change:
 	if(JBLVL != 50) getitem 999,5;

 	if(JBLVL == 50) getitem 999,10;

 	callfunc "F_ClearJobVar";		// clears all job variables for the current player

-	emotion 21;

+	emotion e_no1;

 	close;

 

 	L_NoHam:

@@ -188,7 +189,7 @@ L_Change:
 

 			mes "[Blacksmith Altiregen]";

 			mes "....... grrrrrrr.......";

-			emotion 7;

+			emotion e_ag;

 			close;

 		sM_What:

 			mes "[Blacksmith Altiregen]";

@@ -198,7 +199,7 @@ L_Change:
 			mes "YOU GET TO START ALL OVER!!!!";

 			set BSMITH_Q, 0;

 			set BSMITH_Q2, 0;

-			emotion 32;

+			emotion e_pif;

 		close;

 }

 

@@ -212,7 +213,7 @@ ein_in01.gat,201,27,4	script	Geshupenschte	63,{
 	next;

 	mes "[Geshupenschte]";

 	mes "Blacksmith is such a great job!! Don't you think so? Hahahahahahah!";

-	emotion 18;

+	emotion e_heh;

 	close;

 

 L_merchant:

@@ -232,7 +233,7 @@ L_merchant:
 	next;

 	mes "[Geshupenschte]";

 	mes "What? Why are you still here?";

-	emotion 1;

+	emotion e_what;

 	close;

 

 // Test 1-----------------------------------------------------------------

@@ -834,7 +835,7 @@ L_Test3:
 

 	L_LostItem:

 		mes "WHAT!!! YOU LOST THE ITEM I GAVE YOU TO DELIVER!!!!";

-		emotion 23;

+		emotion e_omg;

 		next;

 		mes "[Geshupenschte]";

 		mes "........... Well then.... I gues you'll just have too.....";

@@ -843,7 +844,7 @@ L_Test3:
 		mes "START ALL OVER!! Now get out of my sight!!";

 		set BSMITH_Q, 0;

 		set BSMITH_Q2, 0;

-		emotion 7;

+		emotion e_ag;

 		close;

 

 L_CheckTest3:

@@ -868,7 +869,7 @@ L_CheckTest3:
 			next;

 			mes "[Geshupenschte]";

 			mes "WHAT'S THIS?! YOU LOST IT!? DId you SELL it or something!?";

-			emotion 23;

+			emotion e_omg;

 			next;

 			mes "[Geshupenschte]";

 			mes "The receipt is the soul of merchants! The life line of blacksmiths!";

@@ -876,7 +877,7 @@ L_CheckTest3:
 			set BSMITH_Q, 0;

 			set BSMITH_Q2, 0;

 			set BSMITH_Q3, 0;

-			emotion 32;

+			emotion e_pif;

 			close;

 	M_Wait:

 		mes "[Geshupenschte]";

@@ -907,7 +908,7 @@ geffen.gat,46,164,4	script	Baisulitst	69,{
 	next;

 	mes "[Baisulitst]";

 	mes "Hmmm....., I wonder when I will recieve my special order ^5555FFArc Wand^000000.....";

-	emotion 20;

+	emotion e_hmm;

 	close;

 

 L_Start:

@@ -940,11 +941,11 @@ L_Start:
 	L_NoItem:

 		mes "[Baisulitst]";

 		mes "..... Hmm?.... What's this?..... You here to deliver something to me but you don't have the actual item??";

-		emotion 32;

+		emotion e_pif;

 	L_Wrong:

 		mes "[Baisulitst]";

 		mes "..... Hmm?.... What's this?..... This is not what I ordered.....";

-		emotion 32;

+		emotion e_pif;

 	L_Done:

 		mes "[Baisulitst]";

 		mes "Thanks again for the delivery.  I really appreciate it!";

@@ -958,11 +959,11 @@ morocc.gat,27,112,4	script	Wickebine	725,{
 	mes "[Wickebine]";

 	mes "..........";

 	mes ".....When will my order be here?";

-	emotion 20;

+	emotion e_hmm;

 	next;

 	mes "[Wickebine]";

 	mes "The Geffen Blacksmith Guild and Geshupenschte are both CHRONICALLY LATE!";

-	emotion 32;

+	emotion e_pif;

 	next;

 	mes "[Wickebine]";

 	mes "This is very upsetting......";

@@ -998,12 +999,12 @@ L_Start:
 	L_NoItem:

 		mes "[Wickebine]";

 		mes "Ung! You came all this way to deliver my item and you lost it??!!";

-		emotion 6;

+		emotion e_an;

 		close;

 	L_Wrong:

 		mes "[Wickebine]";

 		mes "I think you're supposed to deliver this somewhere else.....";

-		emotion 4;

+		emotion e_swt;

 		close;

 	L_Done:	

 		mes "[Wickebine]";

@@ -1058,7 +1059,7 @@ L_Start:
 	L_NoItem:

 		mes "[Gromgast]";

 		mes "Hmm... I don't understand.... where is the item I ordered???....";

-		emotion 20;

+		emotion e_hmm;

 	L_Wrong:

 		mes "[Gromgast]";

 		mes "Sorry, but you've got the wrong person.";

@@ -1115,16 +1116,16 @@ L_Start:
 	L_NoItem:

 		mes "[Tilpitz]";

 		mes "Oooh! The delivery is here? What?..... You don't have anything???.....";

-		emotion 1;

+		emotion e_what;

 		next;

 		mes "[Tilpitz]";

 		mes "Don't play bad jokes on people!";

-		emotion 7;

+		emotion e_ag;

 		close;

 	L_Wrong:

 		mes "[Tilpitz]";

 		mes "What's this? You have a delivery.... for someone else..... Then why not deliver it to that person instead???........";

-		emotion 4;

+		emotion e_swt;

 		close;

 	L_Done:

 		mes "[Tilpitz]";

@@ -1182,12 +1183,12 @@ L_Start:
 	L_NoItem:

 		mes "[Bismarck]";

 		mes "ARE YOU TRYING TO TOY WITH ME!!?? How.... ~cough~... could....~ung~.... you....~ack~.....";

-		emotion 23;

+		emotion e_omg;

 		close;

 	L_Wrong:

 		mes "[Bismarck]";

 		mes "I NEED AN ANTIDOTE DAMMIT!! Not this stuff ~ack~........";

-		emotion 23;

+		emotion e_omg;

 		close;

 	L_Done:

 		mes "[Bismarck]";

@@ -1203,7 +1204,7 @@ ein_in01.gat,24,41,4	script	Mitmayer	726,{
 	if (BSMITH_Q == 5) goto L_Done;

 	mes "[Mitmayer]";

 	mes "Whew.... the sun in Morroc is just too strong.... I guess it will gie me tougher skin... Oh well......";

-	emotion 19;

+	emotion e_swt2;

 	next;

 	mes "[Mitmayer]";

 	mes "Afteralll, we Blacksmiths are used to high temperatures since we work with fire everyday!";

@@ -1395,7 +1396,7 @@ L_Result:
 

 	L_Pass:

 		mes "Great! Congrats! You pass!";

-		emotion 21;

+		emotion e_no1;

 		next;

 		mes "[Mitmayer]";

 		mes "You'll need to return to the guild.  Here is proof that you passed the test.... the ^5533FFHammer of Blacksmiths^000000.";

@@ -1405,7 +1406,7 @@ L_Result:
 		next;

 		mes "[Mitmayer]";

 		mes "DON'T LOOSE THIS!!";

-		emotion 0;

+		emotion e_gasp;

 		next;

 		mes "[Mitmayer]";

 		mes "Well, good luck!!!!";

diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt
index deff0140b..9637e5ff1 100644
--- a/npc/jobs/2-1/hunter.txt
+++ b/npc/jobs/2-1/hunter.txt
@@ -5,7 +5,7 @@
 //= Converted by kobra_k88

 //= Further bugfixed and tested by Lupus

 //===== Current Version: ===================================== 

-//= 1.7

+//= 2.0

 //===== Compatible With: ===================================== 

 //= eAthena 1.0

 //===== Description: ========================================= 

@@ -26,11 +26,12 @@
 //= 1.6a Infinite Arrows exploit fix (thanx to Lorky, that

 //= reported the bug) [Lupus]

 //= 1.7 Moved the Job QUest to Hugel [Poki#3]

+//= 2.0 Changed numbers to constants. [Vicious]

 //============================================================ 

 

 //<====================================== Job Changer ========================================>\\

 hu_in01.gat,386,374,4	script	Hunter Sharon	727,{

-	callfunc "F_BlockHigh",27,"High Archer",35,"Sniper","Hunter Sharon";

+	callfunc "F_BlockHigh",Job_Archer_High,"High Archer",Job_Sniper,"Sniper","Hunter Sharon";

 

 	if(BaseJob==Job_Archer) goto L_Start;

 	callfunc "Hun_check";

@@ -74,7 +75,7 @@ L_Start:
 			close;

 		sL_HighLvl:

 			mes "Well, well now!  A high level archer.... very nice!  You must have trained really hard.";

-			emotion 5;

+			emotion e_ic;

 			next;

 			mes "[Hunter Sharon]";

 			mes "My name is Sharon, nice to meet you.  Before I explain the process of becoming a Hunter, I'd like to do a short interview with you.";

@@ -225,7 +226,7 @@ L_Start:
 		sL_100:

 			mes "[Hunter Sharon]";

 			mes "Great! Based on the answers you gave, you seem to be just the type of person we're looking for.";

-			emotion 21;

+			emotion e_no1;

 			next;

 			mes "[Hunter Sharon]";

 			mes "With your kind of additude and values, you should have no problems becoming a Hunter.";

@@ -242,7 +243,7 @@ L_Start:
 		sL_Failed:

 			mes "[Hunter Sharon]";

 			mes "I.......don't think I can pass you..... The way you live your life is...... well... unexecptable for a Hunter candidate.";

-			emotion 4;

+			emotion e_swt;

 			next;

 			mes "[Hunter Sharon]";

 			mes "Think carefully about my questions and your answers.  Working well with people is just as important as loving nature.";

@@ -260,7 +261,7 @@ L_Test2:
 

 L_Test3:

 	mes "Hmmm? The guild master? Oh, he's out right now.";

-	emotion 20;

+	emotion e_hmm;

 	next;

 	mes "[Hunter Sharon]";

 	mes "If I remember correctly, he should be somewhere in Archer Village.  I think he had to talk with someone in the ^5533FFArcher Guild^000000.";

@@ -273,7 +274,7 @@ L_Change:
 	next;

 	mes "[Hunter Sharon]";

 	mes "Congratulations!!";

-	emotion 21;

+	emotion e_no1;

 	next;

 	mes "[Hunter Sharon]";

 	mes "Now I can change you into a Hunter!";

@@ -282,7 +283,7 @@ L_Change:
 	mes "There you go! You look great in the hunter outfit";

 

 	callfunc "Job_Change",Job_Hunter;

-	emotion 21;

+	emotion e_no1;

 	next;

 	mes "[Hunter Sharon]";

 	mes "Now, for working so hard, the guild has a small reward for you.";

@@ -301,7 +302,7 @@ L_Change:
 	sL_NotRdy:

 		mes "[Hunter Sharon]";

 	       	mes "Hmmm, I received news of your success.... But you don't seem to have the ^5533FFNecklace of Wisdom^000000 as proof.";

-		emotion 20;

+		emotion e_hmm;

 		next;

 		mes "[Hunter Sharon]";

 	       	mes "You will need the Necklace of Wisdom to become a Hunter.  If you don't have it you will have to start the test over.";

@@ -310,12 +311,12 @@ L_Change:
 

 			mes "[Hunter Sharon]";

 			mes "Well then go get it!";

-			emotion 6;

+			emotion e_an;

 			close;

 		sM_ReStart:

 			mes "[Hunter Sharon]";

 			mes "..... That's just pathetic....... Have fun re-doing the ENTIRE TEST!";

-			emotion 32;

+			emotion e_pif;

 			set HNTR_Q, 0;

 			set HNTR_Q2, 0;

 	       		close;

@@ -336,13 +337,13 @@ L_Other:
 	next;

 	mes "[Demon Hunter]";

 	mes "For your safety... it's best that you DON'T find out.....";

-	emotion 29;

+	emotion e_gg;

 	close;

 

 L_Hnt:

 	mes "[Demon Hunter]";

 	mes "Look at you! Nice and spiffy in that Hunter's outfit.  How does it feel?  Good I bet.  Well good luck to you.";

-	emotion 0;

+	emotion e_gasp;

 	close;

 

 L_Arc:

@@ -364,7 +365,7 @@ L_Start:
 		next;

 		mes "[Demon Hunter]";

 		mes "If you haven't noticed already, our guild is NOT as wealthy as some of the others.  I mean we're in the middle of the freaking forest for pete sake....";

-		emotion 7;

+		emotion e_ag;

 		next;

 		mes "[Demon Hunter]";

 		mes "Ehem... Like I was saying earlier we need certain materials to make our arrows.  That is where Hunter wanna be's like you come in handy.";

@@ -423,7 +424,7 @@ L_Start:
 		sM_End:

 			mes "[Demon Hunter]";

 			mes "DON'T you mess around with me! If you're gonna fool around then LEAVE!";

-			emotion 32;

+			emotion e_pif;

 			warp "hugel.gat", 207, 222;

 			end;

 

@@ -476,7 +477,7 @@ L_Check:
 

 L_Test3:

 	mes "Huh? Can't you find the guild master? He should be in the ^5533FFArcher Guild in Archer village^000000. Go find him.";

-	emotion 20;

+	emotion e_hmm;

 	close;

 

 L_Done:

@@ -494,7 +495,7 @@ payon_in02.gat,21,31,1	script	Guild Master	59,{
 L_Other:

 	mes "[Hunter]";

 	mes "Is there something you want of me? I'm have some buisiness to take care of, so please be quiet.";

-	emotion 20;

+	emotion e_hmm;

 	close;

 

 L_Hnt:

@@ -580,7 +581,7 @@ L_ReTest:
 

 L_Passed:

 	mes "I see you suceeded. Great job! Now I will give you the proof of your success, the ^5533FFNecklace of Wisdom^000000.";

-	emotion 21;

+	emotion e_no1;

 	next;

 	mes "[Guild Master]";

 	mes "Here you go.  Make sure you show this to Hunter Sharon or you WON'T be able to become a Hunter.";

diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt
index d41a0ed74..7e80e1849 100644
--- a/npc/jobs/2-1/knight.txt
+++ b/npc/jobs/2-1/knight.txt
@@ -5,7 +5,7 @@
 //= Converted by kobra_k88

 //= Further bugfixed and tested by Lupus

 //===== Current Version: ===================================== 

-//= 1.6

+//= 2.0

 //===== Compatible With: ===================================== 

 //= eAthena 1.0

 //===== Description: ========================================= 

@@ -24,13 +24,14 @@
 //= 1.6 Added a func which prevent advanced classes passing

 //= 2nd Job Quests again. It also guides adv classes where

 //= to go. [Lupus]

+//= 2.0 Changed numbers to constants. [Vicious]

 //============================================================ 

 

 

 

 //<------------------------------------------------------------------------------------ Chivalry Captain Herman------------------------------------------------------------------------------------------>\\

 prt_in.gat,88,101,3	script	Chivalry Captain Herman	56,{

-	callfunc "F_BlockHigh",25,"Swordman High",31,"Lord Knight","Chivalry Captain Herman";

+	callfunc "F_BlockHigh",Job_Swordman_High,"Swordman High",Job_Lord_Knight,"Lord Knight","Chivalry Captain Herman";

 

 	if (BaseJob == Job_Swordman && KNIGHT_Q > 0) goto L_Check;

 

@@ -185,12 +186,12 @@ L_Check:
 		callfunc "F_ClearJobVar";		// clears all job variables for the current player

 		mes "[Chivalry Captain Herman]";

 		mes "Congratulations!! You are now a fellow Knight and protector of Rune-Midgard! Now go forth and make Rune-Midgard a better place to live!";

-		emotion 21;

+		emotion e_no1;

 		close;

 

 		sL_SKpoint:

 			mes "Please use up all of your skill points so that I can make you a Knight.";

-			emotion 5;

+			emotion e_ic;

 			close;

 }

 

@@ -340,7 +341,7 @@ L_Check:
 	L_NotDone:

 		mes "[Sir Andrew Syloc]";

 		mes "What? You don't have everything I asked for?";

-		emotion 4;

+		emotion e_swt;

 		next;

 		mes "[Sir Andrew Syloc]";

 		mes "This is what you were SUPPOSED to collect....";

@@ -713,7 +714,7 @@ L_Novice:
 	close;

 L_Knight:

 	mes "Don't talk to me......";

-	emotion 9;

+	emotion e_dots;

 	close;

 

 

@@ -1010,7 +1011,7 @@ L_Other:
 	close;

 L_Novice:

 	mes "Wow... A cute novice... soooo cute...";

-	emotion 14;

+	emotion e_lv2;

 	next;

 	mes "[Lady Amy Beatris]";

 	mes "Do you want to become a Knight?";

@@ -1026,7 +1027,7 @@ L_Knight:
 	

 	L_Female:

 		mes "Oh my! Aren't you just the prettiest Knight.  I love how your sword matches with your shoes.";

-		emotion 14;

+		emotion e_lv2;

 		next;

 		mes "[Lady Amy Beatris]";

 		mes "Anyway, I'm glad you came back to see me.  I'm always curious about how a Knight turns out.";

@@ -1035,7 +1036,7 @@ L_Knight:
 

 	L_Male:

 		mes "Well hello handsome.  There's just something about men in armor....";

-		emotion 3;

+		emotion e_lv;

 		next;

 		mes "[Lady Amy Beatris]";

 		mes "So, did you come back for some fun...?";

@@ -1044,7 +1045,7 @@ L_Knight:
 

 		M_Yes:

 			mes "^FF0000(SLAPP!! SMACK!! BASH!!)^000000";

-			emotion 6;

+			emotion e_an;

 			percentheal (-10),0;

 			next;

 			mes "[Lady Amy Beatris]";

@@ -1053,18 +1054,18 @@ L_Knight:
 			mes "[Lady Amy Beatris]";

 			mes "Allways remember that a Knight's a Knight, no matter what gender they are.";

 			mes "Also remember to be respectfull to women at all times!";

-			emotion 32;

+			emotion e_pif;

 			close;

  

 		M_No:

 			mes "[Lady Amy Beatris]";

 			mes "Teh he he.  Silly, I'm just playing with you.  You may be good looking, but I'm NOT that kind of girl.";

-			emotion 18;

+			emotion e_heh;

 			next;

 			mes "[Lady Amy Beatris]";

 			mes "Anyway, I'm glad you came back to see me.  I'm always curious about how a Knight turns out.";

 			mes "You look like you're doing fine so continue the good work okay?";

-			emotion 21;

+			emotion e_no1;

 			close;

 

 

@@ -1485,7 +1486,7 @@ L_Novice:
 	next;

 	mes "[Sir Grey]";

 	mes "And somehow after all these years, I ended up becoming one.  Imagine that.... Hahaha.";

-	emotion 18;

+	emotion e_heh;

 	close;

 L_Knight:

 	mes "I don't know if I can even properly describe the ^00aa00Claymore^000000, but I know this... it's the greatest weapon a Knight can wield!!";

diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt
index bc01d73d4..2abb01714 100644
--- a/npc/jobs/2-1/priest.txt
+++ b/npc/jobs/2-1/priest.txt
@@ -5,7 +5,7 @@
 //= Converted by: kobra_k88.

 //= Further bugfixed and tested by Lupus

 //===== Current Version: ===================================== 

-//= 1.6

+//= 2.0

 //===== Compatible With: ===================================== 

 //= eAthena  1.0

 //===== Description: ========================================= 

@@ -18,6 +18,7 @@
 //= 1.6 Added a func which prevent advanced classes passing

 //= 2nd Job Quests again. It also guides adv classes where

 //= to go. [Lupus]

+//= 2.0 Changed numbers to constants. [Vicious]

 ==========================================================

 

 

@@ -25,7 +26,7 @@
 //============================================ Father Thomas: Job changer, Test 1 =============================================\\

 //*********************************************************************************************************************************************************************************\\

 prt_church.gat,16,41,4	script	Father Thomas	60,{

-	callfunc "F_BlockHigh",28,"Acolyte High",32,"High Priest","Father Thomas";

+	callfunc "F_BlockHigh",Job_Acolyte_High,"Acolyte High",Job_High_Priest,"High Priest","Father Thomas";

 

 	mes "[Father Thomas]";

 	if (BaseJob == Job_Acolyte) goto L_Start;

@@ -83,7 +84,7 @@ L_Start:
 

 		sL_HighLvl:

 			mes "Wow, your already at job lvl 50.  I'm amazed at your dedication and hard work!";

-			emotion 0;

+			emotion e_gasp;

 			next;

 			mes "[Father Thomas]";

 			mes "Because of this I will allow you to skip the first task.  How about we start the second task instead?";

@@ -172,7 +173,7 @@ L_Test1:
 			close;

 	L_NotDone1b:

 		mes "Hmmm??";

-		emotion 1;

+		emotion e_what;

 		next;

 		mes "[Father Thomas]";

 		mes "Have you gone to see ^5533FFMother Marthilda^000000 yet?  She can be found near Morroc in the Sogart Desert.";

@@ -246,7 +247,7 @@ L_Change:
 	if (SkillPoint > 0) mes "Wait.  You must use up your skill points in order to become a Priest.";

 	if (SkillPoint > 0) close;

 	mes "Congratulations! You have just completed all of the tests.  I can now turn you into a Priest.";

-	emotion 21;

+	emotion e_no1;

 	next;

 	mes "[Father Thomas]";

 	mes "God, please endow "+strcharinfo(0)+" with the strength and courage to fight evil and help mankind.";

@@ -283,13 +284,13 @@ L_Test:
 	next;

 	mes "[Father Rubalkabara]";

 	mes "What's this? You're here because you wish to serve God in an even greater capacity?";

-	emotion 1;

+	emotion e_what;

 	next;

 	menu "Yes, I believe Priesthood is the right path.",-, "No, not really.... just came to say hi.",M_No;

 

 		mes "[Father Rubalkabara]";

 		mes "Haha! Very good.  We need more people like yourself in order for this world to survive the evils that haunt it.";

-		emotion 21;

+		emotion e_no1;

 		next;

 		mes "[Father Rubalkabara]";

 		mes "Because of your pure heart I will give you my blessing child.  Please meet with ^5533FFMother Marthilda^000000 next.";

@@ -301,7 +302,7 @@ L_Test:
 	M_No:

 		mes "[Father Rubalkabara]";

 		mes "Oh... well then... hello to you too.  Although it is nice to see a servant of God such as yourself, I'm a little busy right now so if you don't mind.....";

-		emotion 4;

+		emotion e_swt;

 		close;

 

 L_Done:

@@ -344,7 +345,7 @@ function	script	F_FatherYos	{
 

 L_Test:

 	mes "Hmm...? Did you need something? Oh the Priest test..... are you sure you're up for that?";

-	emotion 1;

+	emotion e_what;

 	next;

 	mes "[Father Yosuke]";

 	mes "Meh, very well.  I will let you pass.  Go back to the church and speak with Father Thomas.  Your duty here as been fulfilled";

@@ -353,7 +354,7 @@ L_Test:
 

 L_Done:

 	mes "Ugh? What are you still doing here...? I said to go back to the church.... I'm very busy right now....";

-	emotion 1;

+	emotion e_what;

 	close;

 }

 

diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt
index a410e8cc2..f1dfd1ff6 100644
--- a/npc/jobs/2-1/wizard.txt
+++ b/npc/jobs/2-1/wizard.txt
@@ -5,7 +5,7 @@
 //= converted by kobra_k88

 //= Further bugfixed and tested by Lupus

 //===== Current Version: ===================================== 

-//= 1.8

+//= 2.0

 //===== Compatible With: ===================================== 

 //= eAthena 1.0

 //===== Description: ========================================= 

@@ -26,12 +26,13 @@
 //= to go. [Lupus]

 //= 1.7 Replaced 2 Hodes with 2 Horong's (according to the official guide) [Lupus]

 //= 1.8 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon]

+//= 2.0 Changed numbers to constants. [Vicious]

 //============================================================ 

 

 

 //<=================== Some dog =========================>

 gef_tower.gat,107,35,5	script	Some Dog	81,{

-	callfunc "F_BlockHigh",26,"High Mage",33,"High Wizard","Dog";

+	callfunc "F_BlockHigh",Job_Mage_High,"High Mage",Job_High_Wizard,"High Wizard","Dog";

 	if(BaseJob == Job_Mage) goto L_JobMage;

 	callfunc "Wiz1_check";

 

@@ -50,13 +51,13 @@ L_JobMage:
 	M_0:

 		mes "[Dog]";

 		mes "~Woof~ What is it? Why are you looking at me like that?? Is this the first time you've seen a dog talk?";

-		emotion 1;

+		emotion e_what;

 		mes "[Dog]";

 		mes "~Woof~ I suppose it's not that common to see a talking dog..... ~Woof~..... Yeah, it is a rare site actually.....";

 		next;

 		mes "[Dog]";

 		mes "~GRRRR!!~.... Hey! Stop GAWKING at me for goodness sake!! ~WOOOF~";

-		emotion 6;

+		emotion e_an;

 		next;

 

 		L_Cont:

@@ -72,7 +73,7 @@ L_JobMage:
 		next;

 		mes "[Maria]";

 		mes "Uh, anyways..... where were we?";

-		emotion 20;

+		emotion e_hmm;

 		next;

 		mes "[Maria]";

 		mes "Like I said before, if you want to become a Wizard you must first speak with Catherine.";

@@ -118,18 +119,18 @@ L_JobMage:
 		sM_2:

 			mes "[Maria]";

 			mes "I'M NOT A DOG!!! ~ ARROOOOOOOOOWWWWW!!!! ~";

-			emotion 6;

+			emotion e_an;

 			next;

 			mes "[Maria]";

 			mes "Dang it! I hope you FAIL!! Now go get lost!";

-			emotion 27;

+			emotion e_go;

 			next;

 			warp "gef_dun00.gat",54,23;

 			end;

 	M_1:

 		mes "[Dog]";

 		mes "~WOOF~Woof~woof~ You DON'T have to state the obvious! I KNOW I'm a dog!";

-		emotion 32;

+		emotion e_pif;

 		next;

 		goto L_Cont;

 

@@ -249,7 +250,7 @@ L_Mage:
 	M_0End:

 		mes "[Catherine Medichi]";

 		mes "What? You came up here for nothing!?";

-		emotion 1;

+		emotion e_what;

 		close;

 

 

@@ -282,7 +283,7 @@ L_Mage:
 				mes "[Catherine Medichi]";

 				mes "Congrats, you passed the first test.";

 				mes "Don't relax yet, you still got 2 tests left.";

-				emotion 21;

+				emotion e_no1;

 				next;

 				mes "[Catherine Medichi]";

 				mes "Now talk to the man in the corner for the tests.";

@@ -313,11 +314,11 @@ L_Mage:
 

 		sL_Failed2:

 			mes "Huh?? You failed the Q&A test!?";

-			emotion 1;

+			emotion e_what;

 			next;

 			mes "[Catherine Medichi]";

 			mes "You want to be a wizard and you can't answer a couple of questions?? Sheesh.";

-			emotion 4;

+			emotion e_swt;

 			next;

 			mes "[Catherine Medichi]";

 			mes "Well, do you want big sis to give you a hint? If you do, go buy me ^0099001 apple juice^000000.  I'm a bit thirsty. =P";

@@ -424,7 +425,7 @@ L_Mage:
 		if(SkillPoint > 0) close;

 

 		mes "Great! You finished all of the tests! Congrats, congrats, congrats!!";

-		emotion 21;

+		emotion e_no1;

 		next;

 		mes "[Catherine Medichi]";

 		mes "Ack, I'm wasting time, I better change you!";

@@ -470,11 +471,11 @@ L_Other:
 	next;

 	mes "[Raul Expagarus]";

 	mes "Who're you?! Leave!";

-	emotion 0;

+	emotion e_gasp;

 	close;

 L_Novice:

 	mes "What's a little kid like you doing here? Get out!!";

-	emotion 0;

+	emotion e_gasp;

 	next;

 	warp "geffen.gat",120,110;

 	close;

@@ -532,7 +533,7 @@ L_Mage:
 

 	L_Done:

 		mes "Congratulations on finishing the final test!  You have now finished all of the Wizards tests and are ready to become a Wizard!";

-		emotion 21;

+		emotion e_no1;

 		next;

 		mes "[Raul Expagarus]";

 		mes "Go speak to Catherine to become a Wizard.  But be careful! Magic is a powerfull force and can easily destroy you!!";

@@ -559,7 +560,7 @@ L_Mage:
 			next;

 			mes "[Raul Expagarus]";

 			mes "Be that way! If you miss one question, you fail! What do you say!?";

-			emotion 32;

+			emotion e_pif;

 			next;

 			menu "I want to live in peace..........",M_0a, "I want to try again.",M_0b;

 

@@ -577,7 +578,7 @@ L_Mage:
 			next;

 			mes "[Raul Expagarus]";

 			mes "Lets start the test! If you miss one question, you're screwed! HA!";

-			emotion 29;

+			emotion e_gg;

 			next;

 			mes "[Raul Expagarus]";

 			mes "10 questions, get them right! I won't tell you the correct answer for the ones you miss.";

@@ -949,7 +950,7 @@ L_Mage:
 		M_1a:

 			mes "[Raul Expagarus]";

 			mes "Ignorant fool! Fine, go die if you wish! Your corpse will be left as food for the monsters.";

-			emotion 23;

+			emotion e_omg;

 			next;

 			mes "[Raul Expagarus]";

 			mes "I'll send you now... By the way, have fun getting slaughtered!";

@@ -998,7 +999,7 @@ L_Mage:
 

 		sL_ReTest3:

 			mes "You want to take the test AGAIN!? You love magic THAT much!?";

-			emotion 1;

+			emotion e_what;

 			next;

 			mes "[Raul Expagarus]";

 			mes "You failed last time, so it's time for a quiz! If you don't want to take it, TOO BAD!.";

diff --git a/npc/jobs/2-1a/AssassinCross.txt b/npc/jobs/2-1a/AssassinCross.txt
index d56b3df89..fb15f3fd2 100644
--- a/npc/jobs/2-1a/AssassinCross.txt
+++ b/npc/jobs/2-1a/AssassinCross.txt
@@ -4,16 +4,17 @@
 //= Nana

 //= finished, optimized and tested by Lupus

 //===== Current Version: ===================================== 

-//= 1.1

+//= 1.2

 //===== Compatible With: ===================================== 

 //= eAthena 1.0 +

 //===== Description: ========================================= 

 //= Advance Class jobchanger after kRO Normals.

 //===== Additional Comments: ================================= 

 //= v1.1 Made all into functions, additional checks, etc. [Lupus]

+//= v1.2 Made numbers into constants. [Vicious]

 //============================================================ 

 

 // -== Assassin Cross ==-

 valkyrie.gat,44,58,6	script	Assassin Cross	725,{

-	callfunc "F_Rebirth",30,"Thief High",36,"Assassin Cross",149,150,151,152;

+	callfunc "F_Rebirth",Job_Thief_High,"Thief High",Job_Assassin_Cross,"Assassin Cross",149,150,151,152;

 }

diff --git a/npc/jobs/2-1a/HighPriest.txt b/npc/jobs/2-1a/HighPriest.txt
index 2331eaef6..50a79ff24 100644
--- a/npc/jobs/2-1a/HighPriest.txt
+++ b/npc/jobs/2-1a/HighPriest.txt
@@ -4,16 +4,17 @@
 //= Nana

 //= finished, optimized and tested by Lupus

 //===== Current Version: ===================================== 

-//= 1.1

+//= 1.2

 //===== Compatible With: ===================================== 

 //= eAthena 1.0 +

 //===== Description: ========================================= 

 //= Advance Class jobchanger after kRO Normals.

 //===== Additional Comments: ================================= 

 //= v1.1 Made all into functions, additional checks, etc. [Lupus]

+//= v1.2 Made numbers into constants. [Vicious]

 //============================================================ 

 

 // -== High Priest ==-

 valkyrie.gat,44,42,6	script	High Priest	60,{

-	callfunc "F_Rebirth",28,"Acolyte High",32,"High Priest",156,0,0,0;

+	callfunc "F_Rebirth",Job_Acolyte_High,"Acolyte High",Job_High_Priest,"High Priest",156,0,0,0;

 }

diff --git a/npc/jobs/2-1a/HighWizard.txt b/npc/jobs/2-1a/HighWizard.txt
index 44f8469ef..17823200a 100644
--- a/npc/jobs/2-1a/HighWizard.txt
+++ b/npc/jobs/2-1a/HighWizard.txt
@@ -4,16 +4,17 @@
 //= Nana

 //= finished, optimized and tested by Lupus

 //===== Current Version: ===================================== 

-//= 1.1

+//= 1.2

 //===== Compatible With: ===================================== 

 //= eAthena 1.0 +

 //===== Description: ========================================= 

 //= Advance Class jobchanger after kRO Normals.

 //===== Additional Comments: ================================= 

 //= v1.1 Made all into functions, additional checks, etc. [Lupus]

+//= v1.2 Made numbers into constants. [Vicious]

 //============================================================ 

 

 // -== High Wizard ==-

 valkyrie.gat,44,47,6	script	High Wizard	735,{

-	callfunc "F_Rebirth",26,"High Mage",33,"High Wizard",157,0,0,0;

+	callfunc "F_Rebirth",Job_Mage_High,"High Mage",Job_High_Wizard,"High Wizard",157,0,0,0;

 }

diff --git a/npc/jobs/2-1a/LordKnight.txt b/npc/jobs/2-1a/LordKnight.txt
index 96f2f5f56..29de26b90 100644
--- a/npc/jobs/2-1a/LordKnight.txt
+++ b/npc/jobs/2-1a/LordKnight.txt
@@ -4,16 +4,17 @@
 //= Nana

 //= finished, optimized and tested by Lupus

 //===== Current Version: ===================================== 

-//= 1.1

+//= 1.2

 //===== Compatible With: ===================================== 

 //= eAthena 1.0 +

 //===== Description: ========================================= 

 //= Advance Class jobchanger after kRO Normals.

 //===== Additional Comments: ================================= 

 //= v1.1 Made all into functions, additional checks, etc. [Lupus]

+//= v1.2 Made numbers into constants. [Vicious]

 //============================================================ 

 

 // -== Lord Knight ==-

 valkyrie.gat,44,39,6	script	Lord Knight	56,{

-	callfunc "F_Rebirth",25,"Swordman High",31,"Lord Knight",144,145,146,0;

+	callfunc "F_Rebirth",Job_Swordman_High,"Swordman High",Job_Lord_Knight,"Lord Knight",144,145,146,0;

 }

diff --git a/npc/jobs/2-1a/Sniper.txt b/npc/jobs/2-1a/Sniper.txt
index 2a57e1562..54764c3b6 100644
--- a/npc/jobs/2-1a/Sniper.txt
+++ b/npc/jobs/2-1a/Sniper.txt
@@ -4,16 +4,17 @@
 //= Nana

 //= finished, optimized and tested by Lupus

 //===== Current Version: ===================================== 

-//= 1.1

+//= 1.2

 //===== Compatible With: ===================================== 

 //= eAthena 1.0 +

 //===== Description: ========================================= 

 //= Advance Class jobchanger after kRO Normals.

 //===== Additional Comments: ================================= 

 //= v1.1 Made all into functions, additional checks, etc. [Lupus]

+//= v1.2 Made numbers into constants. [Vicious]

 //============================================================ 

 

 // -== Sniper ==-

 valkyrie.gat,44,55,6	script	Sniper	727,{

-	callfunc "F_Rebirth",27,"High Archer",35,"Sniper",147,148,0,0;

+	callfunc "F_Rebirth",Job_Archer_High,"High Archer",Job_Sniper,"Sniper",147,148,0,0;

 }

diff --git a/npc/jobs/2-1a/WhiteSmith.txt b/npc/jobs/2-1a/WhiteSmith.txt
index 95549f892..39f00c9e9 100644
--- a/npc/jobs/2-1a/WhiteSmith.txt
+++ b/npc/jobs/2-1a/WhiteSmith.txt
@@ -4,16 +4,17 @@
 //= Nana

 //= finished, optimized and tested by Lupus

 //===== Current Version: ===================================== 

-//= 1.1

+//= 1.2

 //===== Compatible With: ===================================== 

 //= eAthena 1.0 +

 //===== Description: ========================================= 

 //= Advance Class jobchanger after kRO Normals.

 //===== Additional Comments: ================================= 

 //= v1.1 Made all into functions, additional checks, etc. [Lupus]

+//= v1.2 Made numbers into constants. [Vicious]

 //============================================================ 

 

 // -== White Smith ==-

 valkyrie.gat,44,51,6	script	White Smith	726,{

-	callfunc "F_Rebirth",29,"Merchant High",34,"White Smith",153,154,155,0;

+	callfunc "F_Rebirth",Job_Merchant_High,"Merchant High",Job_Whitesmith,"White Smith",153,154,155,0;

 }

diff --git a/npc/jobs/2-1e/StarGladiator.txt b/npc/jobs/2-1e/StarGladiator.txt
index dd0d4559c..825efab51 100644
--- a/npc/jobs/2-1e/StarGladiator.txt
+++ b/npc/jobs/2-1e/StarGladiator.txt
@@ -24,7 +24,7 @@ job_star.gat,166,37,2	script	Star Gladiator	764,{
 		close;

 	}

 	mes "Are you a Taekwon? No?! Get lost.";

-	emotion 1;

+	emotion e_what;

 	close;

 

 L_Check:

diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt
index 8590c9df8..4bee67f69 100644
--- a/npc/jobs/2-2/alchemist.txt
+++ b/npc/jobs/2-2/alchemist.txt
@@ -4,7 +4,7 @@
 //= nestor_zulueta (Fusion)

 //= converted by Darkchild

 //===== Current Version: ===================================== 

-//= 1.6a

+//= 2.0

 //===== Compatible With: ===================================== 

 //= eAthena 1.0 +

 //===== Description: ========================================= 

@@ -22,6 +22,7 @@
 //= 2nd Job Quests again. It also guides adv classes where

 //= to go. [Lupus]

 //= 1.6a fixed some wrong answers, thanks to zlider for info [Lupus]

+//= 2.0 Changed numbers to constants. [Vicious]

 //============================================================ 

 

 

@@ -29,7 +30,7 @@
 //					Registration and First Test

 //==================================================================================================//

 alde_alche.gat,27,185,4	script	Parmry Gianino	744,{

-	callfunc "F_BlockHigh",29,"Merchant High",42,"Creator","Parmry Gianino";

+	callfunc "F_BlockHigh",Job_Merchant_High,"Merchant High",Job_Creator,"Creator","Parmry Gianino";

 

 	mes "[Parmry Gianino]";

 	if(BaseJob == 5) goto L_Merc;

@@ -1058,7 +1059,7 @@ L_Change:
 	mes "Ooh, Ok. You joined and learned the basics, too. Well done.";

 	next;

 	callfunc "Job_Change",Job_Alchem;

-	emotion 46;

+	emotion e_grat;

 	mes "[Vincent Carsciallo]";

 	mes "From now on, you are also a member of the Union as an Alchemist.";

 	mes "I hope you learn a lot...";

diff --git a/npc/jobs/2-2/bard.txt b/npc/jobs/2-2/bard.txt
index 62e7936e3..2c99ab6f7 100644
--- a/npc/jobs/2-2/bard.txt
+++ b/npc/jobs/2-2/bard.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================

 //= Muad_Dib(The Prometheus Project), Lupus

 //===== Current Version: ===================================== 

-//= 1.4

+//= 2.0

 //===== Compatible With: ===================================== 

 //= eAthena Final

 //===== Description: ========================================= 

@@ -19,11 +19,12 @@
 // 1.3 Updated flower sub-quest according to official [Lupus]

 // 1.4 Changed priority for the gifts. Now you can win the 1st

 // prize, too. Added Izidor flower [Lupus]

+//= 2.0 Changed numbers to constants. [Vicious]

 //============================================================

 

 

 comodo.gat,226,123,5	script	Wandering Bard	741,{

-	callfunc "F_BlockHigh",27,"High Archer",43,"Clown","Wandering Bard";

+	callfunc "F_BlockHigh",Job_Archer_High,"High Archer",Job_Clown,"Clown","Wandering Bard";

 	

 	if (BARD_Q == 1) goto L_BQ1;

 	if (BARD_Q == 2) goto L_BQ2;

@@ -190,7 +191,7 @@ L_UGLYFLOWER:
 	mes "What is it?! Please, back off and put it away from my face.";

 	mes "I do really hate maneater blossoms!!!";

 	mes "THEY ARE SO UGLY!";

-	emotion 23;

+	emotion e_omg;

 	close;

 

 M_NOTHAVE:

diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt
index a0b1f24f8..8bed342e2 100644
--- a/npc/jobs/2-2/crusader.txt
+++ b/npc/jobs/2-2/crusader.txt
@@ -5,7 +5,7 @@
 //= Converted by: Shin

 //=

 //===== Current Version: ===================================== 

-//= 1.7a

+//= 2.0

 //===== Compatible With: ===================================== 

 //= eAthena  0.5.2 +

 //===== Description: ========================================= 

@@ -26,11 +26,12 @@
 //=     to go. [Lupus]

 //= 1.7 Updated names and required items, Chivalry Emblem +

 //=     Hand of God allow to skip item gathering [DracoRPG]

+//= 2.0 Changed numbers to constants. [Vicious]

 //============================================================

 

 

 prt_castle.gat,45,169,4	script	Senior Crusader	752,{

-	callfunc "F_BlockHigh",25,"Swordman High",38,"Paladin","^000080Michael Halig^000000";

+	callfunc "F_BlockHigh",Job_Swordman_High,"Swordman High",Job_Paladin,"Paladin","^000080Michael Halig^000000";

 

 	mes "[^000080Michael Halig^000000]";

 	if (BaseJob > 0) goto NEXT_0;

diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt
index 157721066..f71a09e13 100644
--- a/npc/jobs/2-2/dancer.txt
+++ b/npc/jobs/2-2/dancer.txt
@@ -4,7 +4,7 @@
 //= Kalen - Original jAthena

 //= Fredzilla - Converted

 //===== Current Version: ===================================== 

-//= 1.6

+//= 2.0

 //===== Compatible With: ===================================== 

 //= eAthena Final

 //===== Description: ========================================= 

@@ -21,6 +21,7 @@
 //= 1.6 Added a func which prevent advanced classes passing

 //= 2nd Job Quests again. It also guides adv classes where

 //= to go. [Lupus]

+//= 2.0 Changed numbers to constants. [Vicious]

 //============================================================

 

 //= Warning Warp to escape the quest if need be

@@ -35,7 +36,7 @@ L_Can:
 }

 //= Warp man, takes you to the quest map (Comodo Theater)

 comodo.gat,193,151,4	script	Bor Robin	86,{

-	callfunc "F_BlockHigh",27,"High Archer",44,"Gypsy","Bor Robin";

+	callfunc "F_BlockHigh",Job_Archer_High,"High Archer",Job_Gypsy,"Gypsy","Bor Robin";

 

 	mes "[Bor Robin]";

 	mes "Well...... alot of people seem to be coming here lately.";

@@ -311,7 +312,7 @@ LUpper1:
 	mes "[Aire]";

 	mes "It's such a big honor to salute envoys of Valhalla.";

 	mes "Come again.";

-	emotion 2;

+	emotion e_ho;

 	close;

 

 }

@@ -864,7 +865,7 @@ OnDE1:
 	emotion	21;

 	end;

 OnDE2:

-	emotion 23;

+	emotion e_omg;

 	end;

 }

 job_duncer.gat,66,113,4	script	Back dancer #2::jdt2	724,{

@@ -880,7 +881,7 @@ OnDE1:
 	emotion	21;

 	end;

 OnDE2:

-	emotion 23;

+	emotion e_omg;

 	end;

 }

 job_duncer.gat,72,113,4	script	Back dancer #3::jdt3	724,{

@@ -896,7 +897,7 @@ OnDE1:
 	emotion	21;

 	end;

 OnDE2:

-	emotion 23;

+	emotion e_omg;

 	end;

 }

 job_duncer.gat,75,110,4	script	Back dancer #4::jdt4	724,{

@@ -912,7 +913,7 @@ OnDE1:
 	emotion	21;

 	end;

 OnDE2:

-	emotion 23;

+	emotion e_omg;

 	end;

 }

 job_duncer.gat,75,110,4	script	jdt5	139,{

diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt
index 3a1e70bd4..8d52e1e14 100644
--- a/npc/jobs/2-2/monk.txt
+++ b/npc/jobs/2-2/monk.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================

 //= Dino9021, Edited / Translated by Celest

 //===== Current Version: ===================================== 

-//= 1.9

+//= 2.0

 //===== Compatible With: ===================================== 

 //= eAthena 1.0 +

 //===== Description: ========================================= 

@@ -20,6 +20,7 @@
 //= 1.8 Fixed bugs. Fixed Green Potion exploit. Getting rid of Jfunc mess [Lupus]

 //= 1.9 Added a missing check in Fuhai and fixed a LOT of Engrish. [Zephiris]

 //= 1.9b Fixed another bug in Fuhai. [Zephiris]

+//= 2.0 Changed numbers to constants. [Vicious]

 //============================================================ 

 

 

@@ -33,7 +34,7 @@ prt_monk.gat,55,249,4	script	Tohobu the Guarding Monk	139,0,5,{
 	close;

 }

 prt_monk.gat,59,247,4	script	Master	120,{

-	callfunc "F_BlockHigh",28,"Acolyte High",39,"Champion","Tohobu";

+	callfunc "F_BlockHigh",Job_Acolyte_High,"Acolyte High",Job_Champion,"Champion","Tohobu";

 

 	if(MONK_Q == 1 ) goto Part1;

 	if(MONK_Q == 2 ) goto Part2;

diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt
index 2825d4071..26b13e64e 100644
--- a/npc/jobs/2-2/rogue.txt
+++ b/npc/jobs/2-2/rogue.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= kobra_k88

 //===== Current Version: ===================================== 

-//= 1.6

+//= 2.0

 //===== Compatible With: ===================================== 

 //= eAthena 1.0 +

 //===== Description: ========================================= 

@@ -17,6 +17,7 @@
 //= 1.6 Added a func which prevent advanced classes passing

 //= 2nd Job Quests again. It also guides adv classes where

 //= to go. [Lupus]

+//= 2.0 Changed numbers to constants. [Vicious]

 //============================================================ 

 

 

@@ -24,7 +25,7 @@
 //					Markie: Test 1 and Jobchange						//

 //***********************************************************************************************************************************************************//

 in_rogue.gat,363,123,3	script	Markie	747,{

-	callfunc "F_BlockHigh",30,"Thief High",41,"Stalker","Markie";

+	callfunc "F_BlockHigh",Job_Thief_High,"Thief High",Job_Stalker,"Stalker","Markie";

 

 	mes "[Markie]";

 	if(BaseJob == Job_Thief) goto L_Thief;

@@ -114,7 +115,7 @@ L_Test1:
 		sL_Failed:

 			mes "*sigh*..... this is not the type of score I was expecting......";

 			mes "What can I say excecpt, with a score like this you're definitely not cut out to be a Rogue..........";

-			emotion 4;

+			emotion e_swt;

 			next;

 			mes "[Markie]";

 			mes "Why don't you go do some more training shuga..... you need it..... *mumbles ( what a waste of my time...)*";

@@ -134,7 +135,7 @@ L_Test3:
 	close;

 L_Test4:

 	mes "What are you doing here? I hope your not trying to skip the last test?.........";

-	emotion 1;

+	emotion e_what;

 	next;

 	mes "[Markie]";

 	mes "Your almost finished so just keep trying.  I know you can do it.";

@@ -146,14 +147,14 @@ L_Change:
 //===========

 	mes "Oh, you're back and your in one piece! It looks like you've passed all of the tests sweetie.";

 	mes "You have proven that you are ready to become a Rogue!";

-	emotion 5;

+	emotion e_ic;

 	next;

 	if(SkillPoint != 0) goto L_SkillP;

 	mes "[Markie]";

 	mes "Tada! Congratulations on becoming a Rogue.  You showed a lot of effort and deserve a reward for it......";

 	setlook 7,0;

 	callfunc "Job_Change",Job_Rogue;

-	emotion 46;

+	emotion e_grat;

 	next;

 	mes "[Markie]";

 	mes "Now that you are a Rogue you are free to go where ever you want to and do what ever you want.";

@@ -208,7 +209,7 @@ L_Thief:
 	next;

 	mes "[Mr. Smith]";

 	mes "...... CRAP! I forgot what I was counting!!";

-	emotion 16;

+	emotion e_wah;

 	close;

 

 //----------------------------------------------------------------------------------------------------

@@ -300,7 +301,7 @@ L_Check2:
 

 	L_NotEnuf:

 		mes ".... What the f@&#!?!? You don't have all of the items? Then why did you come back?? Don't tell me you forgot what to get.....";

-		emotion 1;

+		emotion e_what;

 		next;

 		mes "[Mr. Smith]";

 		mes "Write this down! You need ^5533FF10,000^000000 zeny and:";

@@ -310,7 +311,7 @@ L_Check2:
 		next;

 		mes "[Mr. Smith]";

 		mes "Got it? DON'T come back until you have everything.........";

-		emotion 32;

+		emotion e_pif;

 		close;

 

 

@@ -319,11 +320,11 @@ L_Test3:
 //---------------

 	if(ROGUE_Q2 > 0) goto L_Check3;

 	mes "Let me see..... Who should I have you go find........ hmm.........";

-	emotion 20;

+	emotion e_hmm;

 	next;

 	mes "[Mr. Smith]";

 	mes "Ah I know! Alright, in the previous test I had you go find some items.  For this test you will need to find a specific person.";

-	emotion 5;

+	emotion e_ic;

 	next;

 	mes "[Mr. Smith]";

 	set ROGUE_Q2, rand(1,3);

@@ -396,11 +397,11 @@ L_Test3:
 

 L_Check3:

 	mes "What!?! Did you just say you forgot where to go?........";

-	emotion 1;

+	emotion e_what;

 	next;

 	mes "[Mr. Smith]";

 	mes "GRRRR!!! That's why you need to WRITE down important things! Geez......";

-	emotion 6;

+	emotion e_an;

 	next;

 	mes "[Mr. Smith]";

 	if(ROGUE_Q2 == 1) callsub sF3_R1;

@@ -424,15 +425,15 @@ L_Done:
 in_rogue.gat,272,136,3	script	Hermanthorn Jr.	85,{

 	mes "[Hermanthorn Jr.]";

 	mes "Huh? Wha.... who are you?! You're not from the Rogue guild!! Get out of here!";

-	emotion 1;

+	emotion e_what;

 	next;

 	mes "[Hermanthorn Jr.]";

 	mes "You're..... I see! You're one of them!!! You've come here to kill me haven't you??!! No... NO!! I'm not ready to die yet!";

-	emotion 0;

+	emotion e_gasp;

 	next;

 	mes "[Hermanthorn Jr.]";

 	mes "Aaaaaaaaaaaaaahhhh!! Go away! Get lost! Otherwise I am gonna KILL YOU!!!";

-	emotion 16;

+	emotion e_wah;

 	close;

 }

 

@@ -584,7 +585,7 @@ function	script	F_RogueTest4	{
 	next;

 	mes "[" + getarg(0) + "]";

 	mes "Aww who am I kidding...... Let's cut the crap.  So are you ready to become a rogue?";

-	emotion 4;

+	emotion e_swt;

 	next;

 	mes "[" + getarg(0) + "]";

 	mes "You see, the Rogue motto is...... ^5533FF'Avoid the strong! Be malicious to the weak!'^000000";

@@ -624,7 +625,7 @@ function	script	F_RogueTest4	{
 L_Restart:

 	mes "[" + getarg(0) + "]";

 	mes "....... Looks like you got creamed.......";

-	emotion 4;

+	emotion e_swt;

 	next;

 	mes "[" + getarg(0) + "]";

 	mes "If you're up for it, I'll send you back in.  Failure has a way of teaching success.... yada yada yada....";

diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt
index 44645f94c..366f33e49 100644
--- a/npc/jobs/2-2/sage.txt
+++ b/npc/jobs/2-2/sage.txt
@@ -5,7 +5,7 @@
 //= Unknown Translator (1.0)

 //= Darkchild (1.2)

 //===== Current Version: ===================================== 

-//= 1.7a

+//= 2.0

 //===== Compatible With: ===================================== 

 //= eAthena 1.0 +

 //===== Description: ========================================= 

@@ -21,6 +21,7 @@
 //= 2nd Job Quests again. It also guides adv classes where to go. [Lupus]

 //= 1.7 Fixed tuition fee. Fixed some answers, names & typos, added missing labels [Lupus]

 //= 1.7a Moved JFunc back in the main file, fixed typos [Lupus]

+//= 2.0 Changed numbers to constants. [Vicious]

 //============================================================ 

 

 

@@ -28,7 +29,7 @@
 //Sage Castle

 //==================================

 yuno_in02.gat,38,61,4	script	Magic Academy Headmaster 	743,{

-	callfunc "F_BlockHigh",26,"High Mage",40,"Professor","Keiron";

+	callfunc "F_BlockHigh",Job_Mage_High,"High Mage",Job_Professor,"Professor","Keiron";

 	if(BaseJob == 16) goto L_Menu3_3;

 	if(BaseJob != 2) goto L_Menu2_1;

 	if(SAGE_Q == 11) goto L_Menu3_1;

diff --git a/npc/jobs/2-2a/Champion.txt b/npc/jobs/2-2a/Champion.txt
index 68e5cda11..c104ee0af 100644
--- a/npc/jobs/2-2a/Champion.txt
+++ b/npc/jobs/2-2a/Champion.txt
@@ -4,16 +4,17 @@
 //= Nana

 //= finished, optimized and tested by Lupus

 //===== Current Version: ===================================== 

-//= 1.1

+//= 1.2

 //===== Compatible With: ===================================== 

 //= eAthena 1.0 +

 //===== Description: ========================================= 

 //= Advance Class jobchanger after kRO Normals.

 //===== Additional Comments: ================================= 

 //= v1.1 Made all into functions, additional checks, etc. [Lupus]

+//= v1.2 Made numbers into constants. [Vicious]

 //============================================================ 

 

 // -== Champion ==-

 valkyrie.gat,53,42,4	script	Champion	52,{

-	callfunc "F_Rebirth",28,"Acolyte High",39,"Champion",156,0,0,0;

+	callfunc "F_Rebirth",Job_Acolyte_High,"Acolyte High",Job_Champion,"Champion",156,0,0,0;

 }

diff --git a/npc/jobs/2-2a/Clown.txt b/npc/jobs/2-2a/Clown.txt
index 6cdbb3a4b..3fabccefb 100644
--- a/npc/jobs/2-2a/Clown.txt
+++ b/npc/jobs/2-2a/Clown.txt
@@ -4,16 +4,17 @@
 //= Nana

 //= finished, optimized and tested by Lupus

 //===== Current Version: ===================================== 

-//= 1.1

+//= 1.2

 //===== Compatible With: ===================================== 

 //= eAthena 1.0 +

 //===== Description: ========================================= 

 //= Advance Class jobchanger after kRO Normals.

 //===== Additional Comments: ================================= 

 //= v1.1 Made all into functions, additional checks, etc. [Lupus]

+//= v1.2 Made numbers into constants. [Vicious]

 //============================================================ 

 

 // -== Clown ==-

 valkyrie.gat,53,54,4z	script	Clown	741,{

-	callfunc "F_Rebirth",27,"High Archer",43,"Clown",147,148,0,0;

+	callfunc "F_Rebirth",Job_Archer_High,"High Archer",Job_Clown,"Clown",147,148,0,0;

 }

diff --git a/npc/jobs/2-2a/Creator.txt b/npc/jobs/2-2a/Creator.txt
index d8c208d43..6a5e7734c 100644
--- a/npc/jobs/2-2a/Creator.txt
+++ b/npc/jobs/2-2a/Creator.txt
@@ -4,16 +4,17 @@
 //= Nana

 //= finished, optimized and tested by Lupus

 //===== Current Version: ===================================== 

-//= 1.1

+//= 1.2

 //===== Compatible With: ===================================== 

 //= eAthena 1.0 +

 //===== Description: ========================================= 

 //= Advance Class jobchanger after kRO Normals.

 //===== Additional Comments: ================================= 

 //= v1.1 Made all into functions, additional checks, etc. [Lupus]

+//= v1.2 Made numbers into constants. [Vicious]

 //============================================================ 

 

 // -== Creator ==-

 valkyrie.gat,53,50,6	script	Creator	122,{

-	callfunc "F_Rebirth",29,"Merchant High",42,"Creator",153,154,155,0;

+	callfunc "F_Rebirth",Job_Merchant_High,"Merchant High",Job_Creator,"Creator",153,154,155,0;

 }

diff --git a/npc/jobs/2-2a/Gypsy.txt b/npc/jobs/2-2a/Gypsy.txt
index 64cbc7202..989a9336a 100644
--- a/npc/jobs/2-2a/Gypsy.txt
+++ b/npc/jobs/2-2a/Gypsy.txt
@@ -4,16 +4,17 @@
 //= Nana

 //= finished, optimized and tested by Lupus

 //===== Current Version: ===================================== 

-//= 1.1

+//= 1.2

 //===== Compatible With: ===================================== 

 //= eAthena 1.0 +

 //===== Description: ========================================= 

 //= Advance Class jobchanger after kRO Normals.

 //===== Additional Comments: ================================= 

 //= v1.1 Made all into functions, additional checks, etc. [Lupus]

+//= v1.2 Made numbers into constants. [Vicious]

 //============================================================ 

 

 // -== Gypsy ==-

 valkyrie.gat,53,56,4	script	Gypsy	101,{

-	callfunc "F_Rebirth",27,"High Archer",44,"Gypsy",147,148,0,0;

+	callfunc "F_Rebirth",Job_Archer_High,"High Archer",Job_Gypsy,"Gypsy",147,148,0,0;

 }

diff --git a/npc/jobs/2-2a/Paladin.txt b/npc/jobs/2-2a/Paladin.txt
index d796f904f..f17429f76 100644
--- a/npc/jobs/2-2a/Paladin.txt
+++ b/npc/jobs/2-2a/Paladin.txt
@@ -4,16 +4,17 @@
 //= Nana

 //= finished, optimized and tested by Lupus

 //===== Current Version: ===================================== 

-//= 1.1

+//= 1.2

 //===== Compatible With: ===================================== 

 //= eAthena 1.0 +

 //===== Description: ========================================= 

 //= Advance Class jobchanger after kRO Normals.

 //===== Additional Comments: ================================= 

 //= v1.1 Made all into functions, additional checks, etc. [Lupus]

+//= v1.2 Made numbers into constants. [Vicious]

 //============================================================ 

 

 // -== Paladin ==-

 valkyrie.gat,53,39,4	script	Paladin	752,{

-	callfunc "F_Rebirth",25,"Swordman High",38,"Paladin",144,145,146,0;

+	callfunc "F_Rebirth",Job_Swordman_High,"Swordman High",Job_Paladin,"Paladin",144,145,146,0;

 }

diff --git a/npc/jobs/2-2a/Professor.txt b/npc/jobs/2-2a/Professor.txt
index e68ca3672..52f3cb2d6 100644
--- a/npc/jobs/2-2a/Professor.txt
+++ b/npc/jobs/2-2a/Professor.txt
@@ -4,16 +4,17 @@
 //= Nana

 //= finished, optimized and tested by Lupus

 //===== Current Version: ===================================== 

-//= 1.1

+//= 1.2

 //===== Compatible With: ===================================== 

 //= eAthena 1.0 +

 //===== Description: ========================================= 

 //= Advance Class jobchanger after kRO Normals.

 //===== Additional Comments: ================================= 

 //= v1.1 Made all into functions, additional checks, etc. [Lupus]

+//= v1.2 Made numbers into constants. [Vicious]

 //============================================================ 

 

 // -== Professor ==-

 valkyrie.gat,53,47,4	script	Professor	743,{

-	callfunc "F_Rebirth",26,"High Mage",40,"Professor",157,0,0,0;

+	callfunc "F_Rebirth",Job_Mage_High,"High Mage",Job_Professor,"Professor",157,0,0,0;

 }

diff --git a/npc/jobs/2-2a/Stalker.txt b/npc/jobs/2-2a/Stalker.txt
index 490495561..36bd2d37c 100644
--- a/npc/jobs/2-2a/Stalker.txt
+++ b/npc/jobs/2-2a/Stalker.txt
@@ -4,16 +4,17 @@
 //= Nana

 //= finished, optimized and tested by Lupus

 //===== Current Version: ===================================== 

-//= 1.1

+//= 1.2

 //===== Compatible With: ===================================== 

 //= eAthena 1.0 +

 //===== Description: ========================================= 

 //= Advance Class jobchanger after kRO Normals.

 //===== Additional Comments: ================================= 

 //= v1.1 Made all into functions, additional checks, etc. [Lupus]

+//= v1.2 Made numbers into constants. [Vicious]

 //============================================================ 

 

 // -== Stalker ==-

 valkyrie.gat,53,58,4	script	Stalker	747,{

-	callfunc "F_Rebirth",30,"Thief High",41,"Stalker",149,150,151,152;

+	callfunc "F_Rebirth",Job_Thief_High,"Thief High",Job_Stalker,"Stalker",149,150,151,152;

 }

diff --git a/npc/jobs/2-2e/SoulLinker.txt b/npc/jobs/2-2e/SoulLinker.txt
index 7de7d4256..8ae829d80 100644
--- a/npc/jobs/2-2e/SoulLinker.txt
+++ b/npc/jobs/2-2e/SoulLinker.txt
@@ -24,7 +24,7 @@ job_star.gat,99,33,2	script	Soul Linker	764,{
 		close;

 	}

 	mes "I speak to Taekwons only...";

-	emotion 1;

+	emotion e_what;

 	close;

 

 L_Check:

diff --git a/npc/jobs/Jfunc/Jfunc1-1.txt b/npc/jobs/Jfunc/Jfunc1-1.txt
index 4628aedd2..2763a93e0 100644
--- a/npc/jobs/Jfunc/Jfunc1-1.txt
+++ b/npc/jobs/Jfunc/Jfunc1-1.txt
@@ -23,7 +23,7 @@ function	script	Aco_check	{
 

 		JobAco:

 			mes "Are you feeling okay?....";

-			emotion 20;

+			emotion e_hmm;

 			next;

 			mes "[Father Mareusis]";

 			mes "...your attire...";

@@ -33,7 +33,7 @@ function	script	Aco_check	{
 			next;

 			mes "[Father Mareusis]";

 			mes "You are not joking with me, are you? Hoho!!..kids these days.";

-			emotion 18;

+			emotion e_heh;

 			close;

 			

 

@@ -70,7 +70,7 @@ function	script	Arc_check	{
 

 		sL_Archer:

 			mes "Your free spirited nature tells me that you're already an archer....that and the bow and arrow in your hands...Haha";

-			emotion 18;

+			emotion e_heh;

 			close;

 			

 

@@ -105,21 +105,21 @@ function	script	Mag_check	{
 		L_JobMage:

 			mes "You should really get yourself a mirror.  Then you could see that you are ^ff0000already a Mage^000000.";

 			mes "It may even help you fix up your hair do.";

-			emotion 4;

+			emotion e_swt;

 			close;

 			

 

 		L_JobOther:

 			mes "Oh...I'm sorry.  I know they say 2 is always better than 1, but when it comes to Jobs, it's a No No.";

 			mes "Try to stay positive.  Your current job can't be that bad.";

-			emotion 22;

+			emotion e_no;

 			close;

 			

 

 		L_JobLvl:

 			mes "Oh...I'm sorry.  You need ^ff0000Job level 9^000000 and all of the ^0000ffBasic Skills^000000 before you can become a Mage.";

 			mes "Go out and kill some more Fabres okays.";

-			emotion 22;

+			emotion e_no;

 			close;

 			

 

@@ -145,8 +145,8 @@ function	script	Mer_check	{
 		L_JobMer:

 			mes "[Chief Mahnsoo]";

 			mes "Huh? What did you say? You noodle head! Take a good look at yourself.  Your ALREADY A MERCHANT!  Good lord!";

-			emotion 1;

-			emotion 0;

+			emotion e_what;

+			emotion e_gasp;

 			close;

 			

 

@@ -181,7 +181,7 @@ function	script	Swo_check	{
 

 		O_1b:

 			mes "Muhahaha! You must be kidding me! You're already a swordsman.";

-			emotion 18;

+			emotion e_heh;

 			close;

 

 		O_1c:

@@ -189,7 +189,7 @@ function	script	Swo_check	{
 			next;

 			mes "[Master Swordsman]";

 			mes "Try picking up a hobby to make use of your spare time. Muhahahahah!!";

-			emotion 18;

+			emotion e_heh;

 			close;

 

 		O_1d:

@@ -210,7 +210,7 @@ function	script	Thi_check	{
 	if(BaseClass == Job_Merchant) goto L_Merchant;

 

 		mes "You already have a job.  Stop bothering me and go help out some newbies or something.";

-		emotion 21;

+		emotion e_no1;

 		close;

 

 	L_Acolyte:

@@ -220,28 +220,28 @@ function	script	Thi_check	{
 

 	L_Archer:

 		mes "What the heck...? Hahahaha~are you a 'Kill Stealing' Archer...?";

-		emotion 18;

+		emotion e_heh;

 		close;

 

 	L_Mage:

 		mes "What the heck...? Ehhh??? A Circus Sideshow? Make a fire without a Matchstick, will ya?";

-		emotion 19;

+		emotion e_swt2;

 		close;

 

 	L_Merchant:

 		mes "What the heck...? Eeeeeek~Merchant Scammer here...!!!! I am gonna report you to the GM!!!";

-		emotion 0;

+		emotion e_gasp;

 		close;

 

 	L_Swordman:

 		mes "What the heck...? Meh!~Here's another 'Bash' head.  Do me a favor... why don't you go 'BASH', yourself in the head.  Ha!";

-		emotion 29;

+		emotion e_gg;

 		close;

 

 L_JobThief:

 	mes "[Thief Guide]";

 	mes "You're already a thief.....  What do you want from me... go away!";

-	emotion 4;

+	emotion e_swt;

 	close;

 

 }

diff --git a/npc/jobs/Jfunc/Jfunc2-1.txt b/npc/jobs/Jfunc/Jfunc2-1.txt
index 1b62d6494..83727438d 100644
--- a/npc/jobs/Jfunc/Jfunc2-1.txt
+++ b/npc/jobs/Jfunc/Jfunc2-1.txt
@@ -27,36 +27,36 @@ function	script	Ass_check	{
 

 L_JobNov:

 	mes "....HEY Novice!!! GET out of here now!! I won't be held responsible if anything bad happens to you.......";

-	emotion 0;

+	emotion e_gasp;

 	close;

 L_JobSwo:

 	mes "....What are you doing here???";

-	emotion 1;

+	emotion e_what;

 	next;

 	mes "[Angry looking man]";

 	mes "Doing what you're ordered to do eh?........ You guys are nothing more than dogs that listen to their owners.............";

-	emotion 32;

+	emotion e_pif;

 	close;

 L_JobMag:

 	mes "...What's a mage like you doing here? You should be paying more attention to your training.....";

-	emotion 20;

+	emotion e_hmm;

 	close;

 L_JobArch:

 	mes "Uh.... you're one of those people with bows right? Sorry but there are no cute pets here for u to kill..........";

-	emotion 4;

+	emotion e_swt;

 	next;

 	mes "[Angry looking man]";

 	mes "Wait...... You're not here to create trouble eh!!? ....LEAVE AT ONCE!!";

-	emotion 0;

+	emotion e_gasp;

 	close;

 L_JobAco:

 	mes "...Oh God's little helper..... What are you doing down in a dreadful place like this?";

 	mes "Trust me, you're not going to find any salvation here........ why don't you just run along ok?........";

-	emotion 20;

+	emotion e_hmm;

 	close;

 L_JobMerc:

 	mes ".... What the??? Do you have any idea where you are??...... GREEDY SCAMMERS like you are not welcome here!!";

-	emotion 29;

+	emotion e_gg;

 	close;

 L_JobOther:

 	mes ".... Hmm.... although you're not an Assassin or Thief... I have to say I like your sense of style.";

@@ -123,7 +123,7 @@ function	script	Hun_check	{
 L_Nov:

 	mes "[Hunter Sharon]";

 	mes "What's a novice like you doing here? Leave, we have nothing for you.";

-	emotion 1;

+	emotion e_what;

 	close;

 L_Swo:

 	mes "[Hunter Sharon]";

@@ -144,12 +144,12 @@ L_Merc:
 L_Thf:

 	mes "[Hunter Sharon]";

 	mes "Eeep! There's nothing to steal here!! Leave us alone..... go rob an old lady or something......";

-	emotion 23;

+	emotion e_omg;

 	close;

 L_Hunt:

 	mes "[Hunter Sharon]";

 	mes "What up! "+strcharinfo(0)+" Why did you come back? Falcon run away or something? Te hehe.";

-	emotion 18;

+	emotion e_heh;

 	next;

 	mes "[Hunter Sharon]";

 	mes "I hope you didn't think you could get free stuff from us just because your part of our guild now......";

@@ -157,7 +157,7 @@ L_Hunt:
 L_Other:

 	mes "[Hunter Sharon]";

 	mes "What are YOU doing here? Did you come to do a little song and dance... ke.. keke....kekekeHahahahhaha!!!";

-	emotion 18;

+	emotion e_heh;

 	close;

 

 }

@@ -190,12 +190,12 @@ function	script	Kni_check	{
 

 			sL_JobKni:

 				mes "...(sighs)...what are you doing here WASTING my time??  GO FORTH!!, and continue protecting Rune Midgard my young Knight.";

-				emotion 32;

+				emotion e_pif;

 				close;

 

 			sL_JobNov:

 				mes "Hahahaha!!  You have no job experience what so ever and yet you stumble in here asking to be a knight.  Hahahaha!!";

-				emotion 18;

+				emotion e_heh;

 				next;

 				mes "[Chivalry Captain Herman]";

 				mes "You must first become a Swordsman before even thinking about becoming a Knight.  Now scurry along little novice.  Hahahahaha!!!";

@@ -263,7 +263,7 @@ L_Priest:
 	M_1b:

 		mes "[Father Thomas]";

 		mes "Oh...thats a great idea! Since you're a priest, you can't forget that you have to help the Acolytes when they need it.";

-		emotion 5;

+		emotion e_ic;

 		next;

 		mes "[Father Thomas]";

 		mes "Even so, you must be carefull not to do everyting for them.  It is important that they gain their own experiences through training ";

@@ -335,11 +335,11 @@ L_Other:
 	next;

 	mes "[Dog]";

 	mes "If you're that bored, do the world a favor and climb to the top of this building from the outside, then do some acrobatics....";

-	emotion 32;

+	emotion e_pif;

 	next;

 	mes "[Dog]";

 	mes "~WOOF~ Get lost! I don't have time for people like you!!";

-	emotion 27;

+	emotion e_go;

 	close;

 L_Holy:

 	mes "[Dog]";

@@ -368,7 +368,7 @@ L_Other:
 	close;

 L_Novice:

 	mes "Awwww, a little novice!  How cute! This place is for Wizards only though.";

-	emotion 14;

+	emotion e_lv2;

 	next;

 	mes "[Catherine Medichi]";

 	mes "If you're interested in magic, the ^0000FFMagician's Guild^000000 is the place for you.";

@@ -379,7 +379,7 @@ L_Wizard:
 	mes "[Catherine Medichi]";

 	if(sex==1) mes "... Of course, if your here to ask me out... (*giggles*)....";

 	if(sex==0) mes "If you get yourself a boyfriend, feel free to drop by and show him off. XD";

-	emotion 3;

+	emotion e_lv;

 	close;

 

 }

diff --git a/npc/jobs/novice/novice.txt b/npc/jobs/novice/novice.txt
index 11581503f..8ab5107c7 100644
--- a/npc/jobs/novice/novice.txt
+++ b/npc/jobs/novice/novice.txt
@@ -409,7 +409,7 @@ new_1-2.gat,99,105,4	script	Interfaces Instructor	751,{
 			close2;

 			warp "new_1-2.gat",28,178;

 			end;

-		case 3:	emotion 19;

+		case 3:	emotion e_swt2;

 			close;

 		}

 	}

@@ -444,7 +444,7 @@ new_1-2.gat,99,105,4	script	Interfaces Instructor	751,{
 				warp "new_1-2.gat",28,178;

 				end;

 			}

-		case 3:	emotion 19;

+		case 3:	emotion e_swt2;

 			close;

 		}

 	}

@@ -480,7 +480,7 @@ new_1-2.gat,99,105,4	script	Interfaces Instructor	751,{
 				warp "new_1-2.gat",28,178;

 				end;

 			}

-		case 3:	emotion 19;

+		case 3:	emotion e_swt2;

 			close;

 		}

 	}

@@ -612,11 +612,11 @@ new_1-2.gat,83,111,4	script	Skill Instructor	753,{
 				mes "Cheer Up!";

 				close;

 			case 2:	goto L_battle;

-			case 3:	emotion 23;

+			case 3:	emotion e_omg;

 			}

 			close;

 		case 2:	goto L_battle;

-		case 3:	emotion 23;

+		case 3:	emotion e_omg;

 		}

 		close;

 	}

@@ -637,7 +637,7 @@ new_1-2.gat,83,111,4	script	Skill Instructor	753,{
 			mes "It is easy to find him.";

 			close;

 		case 2:	goto L_battle;

-		case 3:	emotion 23;

+		case 3:	emotion e_omg;

 		}

 		close;

 	}

@@ -659,7 +659,7 @@ new_1-2.gat,83,111,4	script	Skill Instructor	753,{
 			warp "new_1-2.gat",115,107;

 			break;

 		case 2:	goto L_battle;

-		case 3:	emotion 23;

+		case 3:	emotion e_omg;

 		}

 		close;

 	}

@@ -1569,7 +1569,7 @@ new_1-2.gat,184,172,4	script	Skill Assistant	47,{
 	mes "your performance,";

 	mes "I will be teaching you with my";

 	mes "best effort.";

-	emotion 30;

+	emotion e_kis;

 L_loop:

 	next;

 	switch( select("Passive and Active Skills.","Passive, Basic Skills.","Use of Emoticons","Cancel") ) {

@@ -1781,7 +1781,7 @@ L_loop1:
 			mes "Anyhow, I really thank to God.";

 			mes "Let's shout";

 			mes "'Praise the Creator!'";

-			emotion 30;

+			emotion e_kis;

 			break;

 		case 3:	mes "[Pitch Judas]";

 			mes "You can ^4d4dffopen a chat room^000000";

@@ -1923,7 +1923,7 @@ L_loop1:
 		mes "commands by typing ^4d4dff/emotion^000000 on your";

 		mes "chat windows.";

 		mes "............HuHu";

-		emotion 3;

+		emotion e_lv;

 		break;

 	case 4:	mes "[Pitch Judas]";

 		mes "Don't you need anything else?";