merged jFunc 2-1

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

1 files changed, 31 insertions, 2 deletions

diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt
index 7cb5952ad..b0e7ca66c 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: ===================================== 

-//= 2.0

+//= 2.1

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

 //= eAthena 1.0

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

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

 //= to go. [Lupus]

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

+//= 2.1 Merged JFunc [Lupus]

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

 

 

@@ -43,7 +44,35 @@ M_Menu:
 

 	M_0:

 		mes "[Chivalry Captain Herman]";

-		callfunc "Kni_check";

+

+		if(BaseJob != Job_Swordman){

+			if(BaseJob == Job_Knight){

+				mes "...(sighs)...what are you doing here WASTING my time??  GO FORTH!!, and continue protecting Rune Midgard my young Knight.";

+				emotion e_pif;

+				close;

+			}

+			if(BaseJob == Job_Novice){

+				mes "Hahahaha!!  You have no job experience what so ever and yet you stumble in here asking to be a knight.  Hahahaha!!";

+				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!!!";

+				close;

+			}

+			mes "I'm sorry but only Swordsmen can become Knights.";

+			close;

+		}

+		mes "Well then, first fill out this application form....";

+		next;

+		mes "...(you fill out the form and hand it back)...";

+		next;

+		mes "[Chivalry Captain Herman]";

+		if(JobLevel < 40){

+			mes "Hmm...it looks like you have not reached Job Level 40 yet.  Please come back when you do.  I shall be waiting here.";

+			close;

+		}

+		mes "Impressive.  You have the job qualifications to become a knight..., however you will need much more than that to actually become one.";

+		next;

 		mes "[Chivalry Captain Herman]";

 		mes "In order to become a Knight one must posses great strength, courage, determination, and strong desire to help others.";

 		next;