constant-fied!

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

6 files changed, 84 insertions, 84 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!";