constant-fied!

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

1 files changed, 18 insertions, 17 deletions

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;