Changed the Advance jobchangers to kRO normals.

They now check if you are level 99/50 as a 2nd class or above, your Quest Skills (and gives them back when you reach 1st Advance Class) and if you have a Cart or Falcon equiped. Also, the minimum requirement to change from Advance 1st class is job level 45 so i added that in too.

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

7 files changed, 643 insertions, 430 deletions

diff --git a/npc/jobs/2-2-1/Champion.txt b/npc/jobs/2-2-1/Champion.txt
index 70b27c23c..a86818498 100644
--- a/npc/jobs/2-2-1/Champion.txt
+++ b/npc/jobs/2-2-1/Champion.txt
@@ -1,61 +1,89 @@
-//Champion Made by Evera/Lorri
+// Advance Class jobchanger after kRO Normals.
+// Checks if the player have any questskills, cart\falcon, level and such.
+// Made by Nana.
+
+// -== Champion ==-
 valkyrie.gat,53,42,4	script	Champion	52,{
-	if (readparam(12) != 0) goto Lskpt;
-	if ((readparam(11) >= 99) && (readparam(19) == 15) && (readparam(55) >= 50)) goto Lnovice;
-	if ((readparam(19) == 4001) && (readparam(55) >= 10)) goto Lh1;
-	if ((readparam(19) == 4001) && (readparam(55) < 10)) goto LCem;
-	if ((readparam(19) == 4005) && (readparam(55) >= 40)) goto Lh2;
-	if ((readparam(19) == 4005) && (readparam(55) < 40)) goto LCem;
-	if (readparam(19) == 4016) goto Lcrazy;
-	mes "[Champion]";
-	mes "Hello";
-	mes "Nice day isn't it?";
-	close;
-Lnovice:
-	mes "[Champion]";
-	mes "Your holy fist seems strong enough. Hmm..";
-	mes "If you devote yourself entirely you can be just like me.";
-	mes "There is a catch though, you have to go back through novice and acolyte.";
-	mes "You wanna do it?";
-	menu "Yes",Lnovice2,"No",Lcancel;
-Lnovice2:
-	mes "We shall start the ceremony....";
-	next;
-	jobchange 24;// Job: Job_Novice_High
+	if(getskilllv(156) > 0) set @qsk;
+	if(checkcart(0) > 0) goto L_Cart;
+	if(readparam(12) > 0) goto Skill_Points;
+	if(readparam(19) >= 4008) goto L_Advance;
+	if((readparam(19) == 4001) && (readparam(55) >= 10)) goto L_HNov;
+	if((readparam(19) == 4005) && (readparam(55) >= 45)) goto L_HACO;
+	if(readparam(19) < 7) goto L_Class;
+	if(readparam(19) == 4001) goto L_Class1;
+	if(readparam(19) == 4005) goto L_Class;
+	if((readparam(11) >= 99) && (readparam(55) >= 50) && (readparam(19) >= 7)) goto L_Change;
+	if((readparam(11) < 99) && (readparam(55) < 50)) goto L_Levels;
+	mes "[Champion]";
+	mes "Hi there...";
+	close;
+
+L_Change:
+	mes "[Champion]";
+	mes "Hello there "+strcharinfo(0)+"!";
+	mes "You've made a brave choice in coming here to be reborn and stepping forth into the ranks of Champion,";
+	mes "I wish you good fortune in the near future!";
+	jobchange 24;
 	resetlvl(1);
 	close;
-Lh1:
+
+L_Cart:
 	mes "[Champion]";
-	mes "Ready to become a high acolyte?";
-	menu "Yes",Lh12,"No",Lcancel;
-Lh12:
+	mes "Please un-equip that cart before continuing.";
+	close;
+
+L_Class1:
 	mes "[Champion]";
-	mes "Your hands are now enchanted with a portion of my power.";
-	next;
-	jobchange 28;// Job: Job_Acolyte_High
+	mes "You're not ready to become an Acolyte High yet...";
+	close;
+
+L_Class:
+	mes "[Champion]";
+	mes "You've come far to get here. unfortunately, you're not ready to become an Champion yet.";
 	close;
-Lh2:
+
+L_Levels:
 	mes "[Champion]";
-	mes "Your fists are now as strong as mine. Will you take the final step and become a champion?";
-	menu "Yes",Lh22,"No",Lcancel;
-Lh22:
+	mes "You're doing great! keep up the good work. You'll eventually get to the point where you can be an Champion";
+	close;
+
+L_HNov:
+	mes "[Champion]";
+	mes "Tread lightly ahead as you're about to enter the distinguished world of Ragnarok.";
+	mes "Must great fortune follow you!";
+	jobchange 28;
+	next;
+	mes "[Champion]";
+	mes "Let me just add in the missing Quest Skills you lost under the Reborn process if you had any, "+strcharinfo(0)+".";
+	next;
+	if(@qsk > 0) goto qsk;
+	next;
+qsk:
+	skill 156,1,0;
+	set @qsk,0;
+	goto L_HNov_2;
+	close;
+
+L_HNov_2:
 	mes "[Champion]";
-	mes "Your hands are now enchanted with a portion of my power.";
-	jobchange 39;// Job: Job_Champion
+	mes "Now when the formalities are fixed, I congratulate you on your Advancement to Acolyte High";
 	close;
-Lcrazy:
+L_HACO:
 	mes "[Champion]";
-	mes "No, I'm not here to fight?";
+	mes "Congratulations!";
+	mes "You're not finally after alot of hard work, able to enter the halls of Valkyrie as an Champion!";
+	jobchange 39;
 	close;
-Lskpt:
+
+Skill_Points:
 	mes "[Champion]";
-	mes "Use your skillpoints first";
+	mes "Please use all of your skillpoints before proceeding.";
 	close;
-LCem:
+
+L_Advance:
 	mes "[Champion]";
-	mes "You're not ready to go to the next level";
-	close;	
-Lcancel:
-	mes "Bye";
+	mes "Hey there! You are already an Reborn. You cannot reach any higher";
+	mes "*whistles*";
 	close;
-}
+}
\ No newline at end of file
diff --git a/npc/jobs/2-2-1/Clown.txt b/npc/jobs/2-2-1/Clown.txt
index 29b919382..9a7fe8e9e 100644
--- a/npc/jobs/2-2-1/Clown.txt
+++ b/npc/jobs/2-2-1/Clown.txt
@@ -1,122 +1,110 @@
-//Made by Veev for eAthena
+// Advance Class jobchanger after kRO Normals.
+// Checks if the player have any questskills, cart\falcon, level and such.
+// Made by Nana.
+
+// -== Clown ==-
 valkyrie.gat,53,54,4z	script	Clown	741,{
+	if(readparam(21) > 0) goto L_Female;
+	if(getskilllv(147) > 0) set @qsk,1;
+	if(getskilllv(148) > 0) set @qsk1,1;
+	if(checkfalcon(0) > 0) goto L_Falcon;
+	if(checkcart(0) > 0) goto L_Cart;
+	if(readparam(12) > 0) goto Skill_Points;
+	if(readparam(19) >= 4008) goto L_Advance;
+	if((readparam(19) == 4001) && (readparam(55) >= 10)) goto L_HNov;
+	if((readparam(19) == 4004) && (readparam(55) >= 45)) goto L_HARC;
+	if(readparam(19) < 7) goto L_Class;
+	if(readparam(19) == 4001) goto L_Class1;
+	if(readparam(19) == 4004) goto L_Class;
+	if((readparam(11) >= 99) && (readparam(55) >= 50) && (readparam(19) >= 7)) goto L_Change;
+	if((readparam(11) < 99) && (readparam(55) < 50)) goto L_Levels;
+	mes "[Clown]";
+	mes "Hi there...";
+	close;
+
+L_Change:
+	mes "[Clown]";
+	mes "Hello there "+strcharinfo(0)+"!";
+	mes "You've made a brave choice in coming here to be reborn and stepping forth into the ranks of Clown,";
+	mes "I wish you good fortune in the near future!";
+	jobchange 24;
+	resetlvl(1);
+	close;
+
+L_Cart:
+	mes "[Clown]";
+	mes "Please un-equip that cart before continuing.";
+	close;
+
+L_Class1:
+	mes "[Clown]";
+	mes "You're not ready to become an High Archer yet.";
+	close;
+
+L_Class:
+	mes "[Clown]";
+	mes "You've come far to get here. unfortunately, you're not ready to become an Clown yet.";
+	close;
+
+L_Levels:
+	mes "[Clown]";
+	mes "You're doing great! keep up the good work. You'll eventually get to the point where you can be an Clown";
+	close;
+
+L_HNov:
+	mes "[Clown]";
+	mes "Tread lightly ahead as you're about to enter the distinguished world of Ragnarok.";
+	mes "Must great fortune follow you!";
+	jobchange 27;
+	next;
+	mes "[Clown]";
+	mes "Let me just add in the missing Quest Skills you lost under the Reborn process if you had any, "+strcharinfo(0)+".";
+	next;
+	if(@qsk > 0) goto qsk;
+	if(@qsk1 > 0) goto qsk1;
+	if(@qsk2 > 0) goto qsk2;
+	if(@qsk3 > 0) goto qsk3;
+	next;
+qsk:
+	skill 147,1,0;
+	set @qsk,0;
+	if(@qsk1 > 0) goto qsk1;
+	goto L_HNov_2;
+qsk1:
+	skill 148,1,0;
+	set @qsk1,0;
+	if(@qsk > 0) goto qsk;
+	goto L_HNov_2;
+
+L_HNov_2:
+	mes "[Clown]";
+	mes "Now when the formalities are fixed, I congratulate you on your Advancement to High Archer";
+	close;
+L_HARC:
+	mes "[Clown]";
+	mes "Congratulations!";
+	mes "You're not finally after alot of hard work, able to enter the halls of Valkyrie as an Clown!";
+	jobchange 43;
+	close;
+
+Skill_Points:
+	mes "[Clown]";
+	mes "Please use all of your skillpoints before proceeding.";
+	close;
+
+L_Advance:
+	mes "[Clown]";
+	mes "Hey there! You are already an Reborn. You cannot reach any higher";
+	mes "*whistles*";
+	close;
 
-mes "[Clown]";
-mes "Well, would you like to sing a song...?";
-mes "But I'll start the song off for you...";
-goto cmenu;
+L_Falcon:
+	mes "[Clown]";
+	mes "Please take your Falcon off before proceeding "+strcharinfo(0)+".";
+	close;
 
-	cmenu:
-	menu "I'm not here to sing.",nosing,"Alright...",alright;
-	
-		nosing:
-		mes "[Clown]";
-		mes "Really?... I see. What brings you here then?";
-		menu "I would like to become a Clown",clown,"Nothing...",nothing;
-		
-			clown:
-			mes "[Clown]";
-			mes "Hmm... Let me make sure you are clown-material...";
-			next;
-			if (sex==0) goto female;
-			if (SkillPoint != 0) goto useskpt;
-			if ((BaseLevel >= 99) && (Class == 19) && (readparam(55) >= 50)) goto highnovice;
-			if ((Class == 4001) && (readparam(55) >= 10)) goto higharcher;
-			if ((Class == 4004) && (readparam(55) >= 40)) goto turnclown;
-			if ((Class == 4004) && (readparam(55) < 40)) goto toolowha;
-			if (Class == 4020) goto alreadyclown;
-			mes "Sorry, but you can't become a clown just yet...";
-			close;
-			
-				female:
-				mes "[Clown]";
-				mes "This job is only for guys... Maybe you should talk to the Gypsy...";
-				close;
-			
-				highnovice:
-				mes "[Clown]";
-				mes "You are on the right track... But first I need to turn you into a High Novice...";
-				mes "Would you like to become a High Novice now?";
-				menu "Yes",hn_yes,"No",hn_no;
-				
-					hn_yes:
-					mes "[Clown]";
-					mes "This will only be a second...";
-					jobchange 24;// Job: Job_Novice_High
-					resetlvl(1);
-					close;
-					
-					hn_no:
-					mes "[Clown]";
-					mes "Come back later if you want to change...";
-					close;
-					
-				higharcher:
-				mes "[Clown]";
-				mes "Even closer to clown now!";
-				mes "Wanna change into a High Archer now?";
-				menu "Yes",ha_yes,"No",ha_no;
-				
-					ha_yes:
-					mes "[Clown]";
-					mes "After this step, you'll be a clown in no time!";
-					jobchange 27;// Job: Job_Archer_High
-					close;
-					
-					ha_no:
-					mes "[Clown]";
-					mes "Well... You can always come back.";
-					close;
-					
-				turnclown:
-				mes "[Clown]";
-				mes "My favorite part of this job! This is exciting!";
-				mes "I'll change you into a Clown now.";
-				menu "Alright!",tc_yes,"Not yet...",tc_no;
-				
-					tc_yes:
-					mes "[Clown]";
-					mes "I love this job!";
-					jobchange 43;// Job: Job_Clown
-					next;
-					mes "[Clown]";
-					mes "Have fun!";
-					close;
-					
-					tc_no:
-					mes "[Clown]";
-					mes "Well... That kinda ruined my day...";
-					close;
-					
-				alreadyclown:
-				mes "[Clown]";
-				mes "You are already a Clown!";
-				mes "Move out of the way and let other people become one";
-				close;
-					
-				useskpt:
-				mes "[Clown]";
-				mes "You need to use those skillpoitns up first.";
-				close;
-				
-				towlowha:
-				mes "[Clown]";
-				mes "Aww, you aren't ready yet! Please come back again when you are ready.";
-				close;	
-				
-			nothing:
-			mes "[Clown]";
-			mes "Sigh...";
-			close;				
-			
-		alright:
-		mes "[Clown]";
-		if (class != 19) goto notbard;
-		mes "Actually you know what... Maybe another time... You don't look like a singer...";
-		close;
-		
-		notbard:
-		mes "[Clown]";
-		mes "... Nice try, but you aren't a Bard... Go bother someone else.";
-		close;	
-}
+L_Female:
+	mes "[Clown]";
+	mes "Only males can become a Clown.";
+	close;
+}
\ No newline at end of file
diff --git a/npc/jobs/2-2-1/Creator.txt b/npc/jobs/2-2-1/Creator.txt
index 07bd0cc93..a48dd7871 100644
--- a/npc/jobs/2-2-1/Creator.txt
+++ b/npc/jobs/2-2-1/Creator.txt
@@ -1,61 +1,106 @@
-//Creator Made by Evera/Lorri 1.1
+// Advance Class jobchanger after kRO Normals.
+// Checks if the player have any questskills, cart\falcon, level and such.
+// Made by Nana.
 
+// -== Creator ==-
 valkyrie.gat,53,50,6	script	Creator	122,{
-	if (readparam(12) != 0) goto Lskpt;
-	if ((readparam(11) >= 99) && (readparam(19) == 18) && (readparam(55) >= 50)) goto Lnovice;
-	if ((readparam(19) == 4001) && (readparam(55) >= 10)) goto Lh1;
-	if ((readparam(19) == 4001) && (readparam(55) < 10)) goto LCem;
-	if ((readparam(19) == 4006) && (readparam(55) >= 40)) goto Lh2;
-	if ((readparam(19) == 4006) && (readparam(55) < 40)) goto LCem;
-	if (readparam(19) == 4019) goto Lcrazy;
-	mes "[Creator]";
-	mes "Hello";
-	mes "Sorry, no potions for sale.";
-	close;
-Lnovice:
-	mes "[Creator]";
-	mes "Hm. You seem to have extensive knowledge in chemistry. Would you like to become a creator?";
-	mes "There is a catch though, you have to go back through novice and merchant.";
-	mes "You wanna do it?";
-	menu "Yes",Lnovice2,"No",Lcancel;
-Lnovice2:
-	mes "We shall start the ceremony....";
-	next;
-	jobchange 24;// Job: Job_Novice_High
+	if(getskilllv(153) > 0) set @qsk,1;
+	if(getskilllv(154) > 0) set @qsk1,1;
+	if(getskilllv(155) > 0) set @qsk2,1;
+	if(checkcart(0) > 0) goto L_Cart;
+	if(readparam(12) > 0) goto Skill_Points;
+	if(readparam(19) >= 4008) goto L_Advance;
+	if((readparam(19) == 4001) && (readparam(55) >= 10)) goto L_HNov;
+	if((readparam(19) == 4007) && (readparam(55) >= 45)) goto L_HMERC;
+	if(readparam(19) < 7) goto L_Class;
+	if(readparam(19) == 4001) goto L_Class1;
+	if(readparam(19) == 4007) goto L_Class;
+	if((readparam(11) >= 99) && (readparam(55) >= 50) && (readparam(19) >= 7)) goto L_Change;
+	if((readparam(11) < 99) && (readparam(55) < 50)) goto L_Levels;
+	mes "[Creator]";
+	mes "Hi there...";
+	close;
+
+L_Change:
+	mes "[Creator]";
+	mes "Hello there "+strcharinfo(0)+"!";
+	mes "You've made a brave choice in coming here to be reborn and stepping forth into the ranks of Creator,";
+	mes "I wish you good fortune in the near future!";
+	jobchange 24;
 	resetlvl(1);
 	close;
-Lh1:
+
+L_Cart:
 	mes "[Creator]";
-	mes "Ready to become a high merchant?";
-	menu "Yes",Lh12,"No",Lcancel;
-Lh12:
+	mes "Please un-equip that cart before continuing.";
+	close;
+
+L_Class1:
 	mes "[Creator]";
-	mes "Here, take this potion.";
-	next;
-	jobchange 29;// Job: Job_Merchant_High
+	mes "You're not ready to become an High Merchant yet.";
 	close;
-Lh2:
+
+L_Class:
 	mes "[Creator]";
-	mes "You knowledge unbounds you. Will you become a professor?";
-	menu "Yes",Lh22,"No",Lcancel;
-Lh22:
+	mes "You've come far to get here. unfortunately, you're not ready to become an Creator yet.";
+	close;
+
+L_Levels:
 	mes "[Creator]";
-	mes "Here, take this potion.";
-	jobchange Job_Creator; //42
+	mes "You're doing great! keep up the good work. You'll eventually get to the point where you can be an Creator";
 	close;
-Lcrazy:
+
+L_HNov:
+	mes "[Creator]";
+	mes "Tread lightly ahead as you're about to enter the distinguished world of Ragnarok.";
+	mes "Must great fortune follow you!";
+	jobchange 29;
+	next;
 	mes "[Creator]";
-	mes "Hm. You look like me.";
+	mes "Let me just add in the missing Quest Skills you lost under the Reborn process if you had any, "+strcharinfo(0)+".";
+	next;
+	if(@qsk > 0) goto qsk;
+	if(@qsk1 > 0) goto qsk1;
+	if(@qsk2 > 0) goto qsk2;
+	next;
+qsk:
+	skill 153,1,0;
+	set @qsk,0;
+	if(@qsk1 > 0) goto qsk1;
+	if(@qsk2 > 0) goto qsk2;
+	goto L_HNov_2;
+qsk1:
+	skill 154,1,0;
+	set @qsk1,0;
+	if(@qsk > 0) goto qsk;
+	if(@qsk2 > 0) goto qsk2;
+	goto L_HNov_2;
+qsk2:
+	skill 155,1,0;
+	set @qsk2,0;
+	if(@qsk > 0) goto qsk;
+	if(@qsk1 > 0) goto qsk1;
+	goto L_HNov_2;
+
+L_HNov_2:
+	mes "[Creator]";
+	mes "Now when the formalities are fixed, I congratulate you on your Advancement to High Merchant";
 	close;
-Lskpt:
+L_HMERC:
 	mes "[Creator]";
-	mes "Use your skillpoints first";
+	mes "Congratulations!";
+	mes "You're not finally after alot of hard work, able to enter the halls of Valkyrie as an Creator!";
+	jobchange 42;
 	close;
-LCem:
+
+Skill_Points:
+	mes "[Creator]";
+	mes "Please use all of your skillpoints before proceeding.";
+	close;
+
+L_Advance:
 	mes "[Creator]";
-	mes "You're not ready to go to the next level";
-	close;	
-Lcancel:
-	mes "Bye";
+	mes "Hey there! You are already an Reborn. You cannot reach any higher";
+	mes "*whistles*";
 	close;
-}
+}
\ No newline at end of file
diff --git a/npc/jobs/2-2-1/Gypsy.txt b/npc/jobs/2-2-1/Gypsy.txt
index 41c42ec02..bc3914af9 100644
--- a/npc/jobs/2-2-1/Gypsy.txt
+++ b/npc/jobs/2-2-1/Gypsy.txt
@@ -1,89 +1,110 @@
-//Made by Evera/Lorri
+// Advance Class jobchanger after kRO Normals.
+// Checks if the player have any questskills, cart\falcon, level and such.
+// Made by Nana.
+
+// -== Gypsy ==-
 valkyrie.gat,53,56,4	script	Gypsy	101,{
-if (sex==1) goto Lmale;
-if (readparam(12) != 0) goto Lskpt;
-if ((BaseLevel >= 99) && (readparam(19) == 20) && (readparam(55) >= 50)) goto Lnovice;
-if ((readparam(19) == 24) && (joblevel >= 10)) goto Larcher;
-if ((readparam(19) == 27) && (joblevel >= 40)) goto Lgypsy2;
-if ((readparam(19) == 27) && (joblevel < 40)) goto Lgypsy3;
-if (readparam(19) == 44) goto Lomg;
+	if(readparam(21) < 1) goto L_Male;
+	if(getskilllv(147) > 0) set @qsk,1;
+	if(getskilllv(148) > 0) set @qsk1,1;
+	if(checkfalcon(0) > 0) goto L_Falcon;
+	if(checkcart(0) > 0) goto L_Cart;
+	if(readparam(12) > 0) goto Skill_Points;
+	if(readparam(19) >= 4008) goto L_Advance;
+	if((readparam(19) == 4001) && (readparam(55) >= 10)) goto L_HNov;
+	if((readparam(19) == 4004) && (readparam(55) >= 45)) goto L_HARC;
+	if(readparam(19) < 7) goto L_Class;
+	if(readparam(19) == 4001) goto L_Class1;
+	if(readparam(19) == 4004) goto L_Class;
+	if((readparam(11) >= 99) && (readparam(55) >= 50) && (readparam(19) >= 7)) goto L_Change;
+	if((readparam(11) < 99) && (readparam(55) < 50)) goto L_Levels;
+	mes "[Gypsy]";
+	mes "Hi there...";
+	close;
+
+L_Change:
+	mes "[Gypsy]";
+	mes "Hello there "+strcharinfo(0)+"!";
+	mes "You've made a brave choice in coming here to be reborn and stepping forth into the ranks of Gypsy,";
+	mes "I wish you good fortune in the near future!";
+	jobchange 24;
+	resetlvl(1);
+	close;
+
+L_Cart:
+	mes "[Gypsy]";
+	mes "Please un-equip that cart before continuing.";
+	close;
+
+L_Class1:
+	mes "[Gypsy]";
+	mes "You're not ready to become an High Archer yet.";
+	close;
+
+L_Class:
+	mes "[Gypsy]";
+	mes "You've come far to get here. unfortunately, you're not ready to become an Gypsy yet.";
+	close;
+
+L_Levels:
+	mes "[Gypsy]";
+	mes "You're doing great! keep up the good work. You'll eventually get to the point where you can be an Gypsy";
+	close;
+
+L_HNov:
+	mes "[Gypsy]";
+	mes "Tread lightly ahead as you're about to enter the distinguished world of Ragnarok.";
+	mes "Must great fortune follow you!";
+	jobchange 27;
+	next;
+	mes "[Gypsy]";
+	mes "Let me just add in the missing Quest Skills you lost under the Reborn process if you had any, "+strcharinfo(0)+".";
+	next;
+	if(@qsk > 0) goto qsk;
+	if(@qsk1 > 0) goto qsk1;
+	if(@qsk2 > 0) goto qsk2;
+	if(@qsk3 > 0) goto qsk3;
+	next;
+qsk:
+	skill 147,1,0;
+	set @qsk,0;
+	if(@qsk1 > 0) goto qsk1;
+	goto L_HNov_2;
+qsk1:
+	skill 148,1,0;
+	set @qsk1,0;
+	if(@qsk > 0) goto qsk;
+	goto L_HNov_2;
 
-Lnovice:
-mes "[Gypsy]";
-mes "Hey you there! Are you a dancer?";
-mes "There's a secret I wanna tell you.. You can get even more dances if you become a Gypsy! So do you wanna be a gypsy?";
-menu 
-"Yes",Lyes,"No way, you crazy?",Lcancel;
-Lyes:
-		mes "Hmm...?";
-		next;
-		mes "Alright, do you know the requirements? You have to be strong and adept at battling and dancing.";
-		mes "Level 99 and Job Level 50!";
-		mes "You have to be a dancer ofcourse";
-		mes "You sure you want to become a gypsy? You'll go back to a 1/1 novice...";
-		menu "Yes",Lnyes,"No",Lano;	
-			
-Lmale:
-		mes "[Gypsy]";
-		mes "Shoo! Boys!";
-		close;
-							
-Lnyes:
-if (readparam(12) != 0) goto Lskpt;
-		mes "Come back in 10 job levels then. Good luck!";
-		jobchange 24;// Job: Job_Novice_High
-		resetlvl(1);
-		close;
-					
-Larcher:
-		mes "[Gypsy]";
-		mes "You can almost dance!";
-		mes "Change into a high archer?";
-		menu "Yes",Layes,"No",Lano;
-				
-Layes:
-if (readparam(12) != 0) goto Lskpt;
-		mes "Hurry up and get 40 job levels!";
-		jobchange 27;// Job: Job_Archer_High
-		close;
-					
+L_HNov_2:
+	mes "[Gypsy]";
+	mes "Now when the formalities are fixed, I congratulate you on your Advancement to High Archer";
+	close;
+L_HARC:
+	mes "[Gypsy]";
+	mes "Congratulations!";
+	mes "You're not finally after alot of hard work, able to enter the halls of Valkyrie as an Gypsy!";
+	jobchange 44;
+	close;
 
-					
-Lgypsy2:
-		mes "I will now dance a magical dance for you.";
-		mes "One last chance, do you truly want to become a gypsy?";
-		menu "..Yes",Lcyes,"Not yet...",Lano;
-				
-Lcyes:
-if (readparam(12) != 0) goto Lskpt;
-		mes "Congratulations! You are now a gypsy";
-		jobchange 44;// Job: Job_Gypsy
-		next;
-		mes "[Gypsy]";
-		mes "Don't outdo yourself";
-		close;
-							
-Lskpt:
-		mes "[Gypsy]";
-		mes "You need to use those skillpoints up first.";
-		close;
-				
-Lgypsy3:
-		mes "[Gypsy]";
-		mes "Doesn't look like you're sufficient for the job";
-		close;				
+Skill_Points:
+	mes "[Gypsy]";
+	mes "Please use all of your skillpoints before proceeding.";
+	close;
 
-Lano:
-		mes "Well, goodbye!";
-		close;
+L_Advance:
+	mes "[Gypsy]";
+	mes "Hey there! You are already an Reborn. You cannot reach any higher";
+	mes "*whistles*";
+	close;
 
-Lcancel:
-		mes "[Gypsy]";
-		mes "Well bye then..";
-		close;
+L_Falcon:
+	mes "[Gypsy]";
+	mes "Please take your Falcon off before proceeding "+strcharinfo(0)+".";
+	close;
 
-Lomg:
-		mes "[Gypsy]";
-		mes "Wait.. Haven't I seen you before?";
-		close;	
-}
+L_Male:
+	mes "[Gypsy]";
+	mes "Only females can become a Gypsy.";
+	close;
+}
\ No newline at end of file
diff --git a/npc/jobs/2-2-1/Paladin.txt b/npc/jobs/2-2-1/Paladin.txt
index 245660c34..6694c973a 100644
--- a/npc/jobs/2-2-1/Paladin.txt
+++ b/npc/jobs/2-2-1/Paladin.txt
@@ -1,62 +1,107 @@
-//Paladin Made by Evera/Lorri
-//Fixed by PoW
+// Advance Class jobchanger after kRO Normals.
+// Checks if the player have any questskills, cart\falcon, level and such.
+// Made by Nana.
+
+// -== Paladin ==-
 valkyrie.gat,53,39,4	script	Paladin	752,{
-	if (SkillPoint != 0) goto Lskpt;
-	if ((readparam(11) >= 99) && (readparam(19) == 14) && (readparam(55) >= 50)) goto Lnovice;
-	if ((readparam(11) >= 99) && (readparam(19) == 21) && (readparam(55) >= 50)) goto Lnovice; 
-	if ((readparam(19) == 4001) && (readparam(55) >= 10)) goto Lh1;
-	if ((readparam(19) == 4001) && (readparam(55) < 10)) goto LCem;
-	if ((readparam(19) == 4002) && (readparam(55) >= 40)) goto Lh2;
-	if ((readparam(19) == 4002) && (readparam(55) < 40)) goto LCem;
-	if (readparam(19) == 4015) goto Lcrazy;
-	mes "[Paladin]";
-	mes "Hello";
-	mes "God will always be there to help.";
-	close;
-Lnovice:
-	mes "[Paladin]";
-	mes "Your holy aura is strong. Will you become a paladin?";
-	mes "There is a catch though, you have to go back through novice and merchant.";
-	mes "You wanna do it?";
-	menu "Yes",Lnovice2,"No",Lcancel;
-Lnovice2:
-	mes "We shall start the ceremony....";
-	next;
-	jobchange 24;// Job: Job_Novice_High
+	if(getskilllv(144) > 0) set @qsk,1;
+	if(getskilllv(145) > 0) set @qsk1,1;
+	if(getskilllv(146) > 0) set @qsk2,1;
+	if(checkcart(0) > 0) goto L_Cart;
+	if(readparam(12) > 0) goto Skill_Points;
+	if(readparam(19) >= 4008) goto L_Advance;
+	if((readparam(19) == 4001) && (readparam(55) >= 10)) goto L_HNov;
+	if((readparam(19) == 4002) && (readparam(55) >= 45)) goto L_HSWM;
+	if(readparam(19) < 7) goto L_Class;
+	if(readparam(19) == 4001) goto L_Class1;
+	if(readparam(19) == 4002) goto L_Class;
+	if((readparam(11) >= 99) && (readparam(55) >= 50) && (readparam(19) >= 7)) goto L_Change;
+	if((readparam(11) < 99) && (readparam(55) < 50)) goto L_Levels;
+	mes "[Paladin]";
+	mes "Hi there...";
+	close;
+
+L_Change:
+	mes "[Paladin]";
+	mes "Hello there "+strcharinfo(0)+"!";
+	mes "You've made a brave choice in coming here to be reborn and stepping forth into the ranks of Paladin,";
+	mes "I wish you good fortune in the near future!";
+	jobchange 24;
 	resetlvl(1);
 	close;
-Lh1:
+
+L_Cart:
 	mes "[Paladin]";
-	mes "Ready to become a high swordsman?";
-	menu "Yes",Lh12,"No",Lcancel;
-Lh12:
+	mes "Please un-equip that cart before continuing.";
+	close;
+
+L_Class1:
 	mes "[Paladin]";
-	mes "By the holy resovoir in this blessed sword, I crown you.";
-	next;
-	jobchange 25;// Job: Job_Swordman_High
+	mes "You're not ready to become an High Swordsman yet.";
+	close;
+
+L_Class:
+	mes "[Paladin]";
+	mes "You've come far to get here. unfortunately, you're not ready to become an Paladin yet.";
+	close;
+
+L_Levels:
+	mes "[Paladin]";
+	mes "You're doing great! keep up the good work. You'll eventually get to the point where you can be an Paladin";
 	close;
-Lh2:
+
+L_HNov:
 	mes "[Paladin]";
-	mes "Your holy aura is extremely high. You are ready. Will you become a paladin?";
-	menu "Yes",Lh22,"No",Lcancel;
-Lh22:
+	mes "Tread lightly ahead as you're about to enter the distinguished world of Ragnarok.";
+	mes "Must great fortune follow you!";
+	jobchange 25;
+	next;
+	mes "[Paladin]";
+	mes "Let me just add in the missing Quest Skills you lost under the Reborn process if you had any, "+strcharinfo(0)+".";
+	next;
+	if(@qsk > 0) goto qsk;
+	if(@qsk1 > 0) goto qsk1;
+	if(@qsk2 > 0) goto qsk2;
+	if(@qsk3 > 0) goto qsk3;
+	next;
+qsk:
+	skill 144,1,0;
+	set @qsk,0;
+	if(@qsk1 > 0) goto qsk1;
+	if(@qsk2 > 0) goto qsk2;
+	goto L_HNov_2;
+qsk1:
+	skill 145,1,0;
+	set @qsk1,0;
+	if(@qsk > 0) goto qsk;
+	if(@qsk2 > 0) goto qsk2;
+	goto L_HNov_2;
+qsk2:
+	skill 146,1,0;
+	set @qsk2,0;
+	if(@qsk > 0) goto qsk;
+	if(@qsk1 > 0) goto qsk1;
+	goto L_HNov_2;
+
+L_HNov_2:
 	mes "[Paladin]";
-	mes "By the holy resovoir in this blessed sword, I crown you.";
-	jobchange 38;// Job: Job_Paladin
+	mes "Now when the formalities are fixed, I congratulate you on your Advancement to High Swordsman";
 	close;
-Lcrazy:
+L_HSWM:
 	mes "[Paladin]";
-	mes "God has helped you very much.";
+	mes "Congratulations!";
+	mes "You're not finally after alot of hard work, able to enter the halls of Valkyrie as an Paladin!";
+	jobchange 38;
 	close;
-Lskpt:
+
+Skill_Points:
 	mes "[Paladin]";
-	mes "Use your skillpoints first";
+	mes "Please use all of your skillpoints before proceeding.";
 	close;
-LCem:
+
+L_Advance:
 	mes "[Paladin]";
-	mes "You're not ready to go to the next level";
-	close;	
-Lcancel:
-	mes "Bye";
+	mes "Hey there! You are already an Reborn. You cannot reach any higher";
+	mes "*whistles*";
 	close;
-}
+}
\ No newline at end of file
diff --git a/npc/jobs/2-2-1/Professor.txt b/npc/jobs/2-2-1/Professor.txt
index c0c1cb78f..e7d94d9ac 100644
--- a/npc/jobs/2-2-1/Professor.txt
+++ b/npc/jobs/2-2-1/Professor.txt
@@ -1,61 +1,88 @@
-//Professor Made by Evera/Lorri
-//Fixed by PoW
+// Advance Class jobchanger after kRO Normals.
+// Checks if the player have any questskills, cart\falcon, level and such.
+// Made by Nana.
+
+// -== Professor ==-
 valkyrie.gat,53,47,4	script	Professor	743,{
-	if (readparam(12) != 0) goto Lskpt;
-	if ((readparam(11) >= 99) && (readparam(19) == 16) && (readparam(55) >= 50)) goto Lnovice;
-	if ((readparam(19) == 4001) && (readparam(55) >= 10)) goto Lh1;
-	if ((readparam(19) == 4001) && (readparam(55) < 10)) goto LCem;
-	if ((readparam(19) == 4003) && (readparam(55) >= 40)) goto Lh2;
-	if ((readparam(19) == 4003) && (readparam(55) < 40)) goto LCem;
-	if (readparam(19) == 4017) goto Lcrazy;
-	mes "[Professor]";
-	mes "Hello";
-	mes "Knowledge is the key.";
-	close;
-Lnovice:
-	mes "[Professor]";
-	mes "You seem smart. Hm. Do you wish to persue your dream of knowledge and become a professor like me?";
-	mes "There is a catch though, you have to go back through novice and mage.";
-	mes "You wanna do it?";
-	menu "Yes",Lnovice2,"No",Lcancel;
-Lnovice2:
-	mes "We shall start the ceremony....";
-	next;
-	jobchange 24;// Job: Job_Novice_High
+	if(getskilllv(157) > 0) set @qsk,1;
+	if(checkcart(0) > 0) goto L_Cart;
+	if(readparam(12) > 0) goto Skill_Points;
+	if(readparam(19) >= 4008) goto L_Advance;
+	if((readparam(19) == 4001) && (readparam(55) >= 10)) goto L_HNov;
+	if((readparam(19) == 4003) && (readparam(55) >= 45)) goto L_HMAG;
+	if(readparam(19) < 7) goto L_Class;
+	if(readparam(19) == 4001) goto L_Class1;
+	if(readparam(19) == 4003) goto L_Class;
+	if((readparam(11) >= 99) && (readparam(55) >= 50) && (readparam(19) >= 7)) goto L_Change;
+	if((readparam(11) < 99) && (readparam(55) < 50)) goto L_Levels;
+	mes "[Professor]";
+	mes "Hi there...";
+	close;
+
+L_Change:
+	mes "[Professor]";
+	mes "Hello there "+strcharinfo(0)+"!";
+	mes "You've made a brave choice in coming here to be reborn and stepping forth into the ranks of Professor,";
+	mes "I wish you good fortune in the near future!";
+	jobchange 24;
 	resetlvl(1);
 	close;
-Lh1:
+
+L_Cart:
 	mes "[Professor]";
-	mes "Ready to become a high mage?";
-	menu "Yes",Lh12,"No",Lcancel;
-Lh12:
+	mes "Please un-equip that cart before continuing.";
+	close;
+
+L_Class1:
 	mes "[Professor]";
-	mes "Read this book, you'll be enchanted by its magic";
-	next;
-	jobchange 26;// Job: Job_Mage_High
+	mes "You're not ready to become an High Mage yet.";
+	close;
+
+L_Class:
+	mes "[Professor]";
+	mes "You've come far to get here. unfortunately, you're not ready to become an Professor yet.";
+	close;
+
+L_Levels:
+	mes "[Professor]";
+	mes "You're doing great! keep up the good work. You'll eventually get to the point where you can be an Professor";
 	close;
-Lh2:
+
+L_HNov:
 	mes "[Professor]";
-	mes "It appears as your intelligence quota surpasses mine. Will you become a professor";
-	menu "Yes",Lh22,"No",Lcancel;
-Lh22:
+	mes "Tread lightly ahead as you're about to enter the distinguished world of Ragnarok.";
+	mes "Must great fortune follow you!";
+	jobchange 26;
+	next;
+	mes "[Professor]";
+	mes "Let me just add in the missing Quest Skills you lost under the Reborn process if you had any, "+strcharinfo(0)+".";
+	next;
+	if(@qsk > 0) goto qsk;
+	next;
+qsk:
+	skill 157,1,0;
+	set @qsk,0;
+	goto L_HNov_2;
+
+L_HNov_2:
 	mes "[Professor]";
-	mes "Read this book, you'll be enchanted by its magic";
-	jobchange 40;// Job: Job_Professor
+	mes "Now when the formalities are fixed, I congratulate you on your Advancement to High Mage";
 	close;
-Lcrazy:
+L_HMAG:
 	mes "[Professor]";
-	mes "Your intelligence will surpass many other unfortunate souls who have not found truth in a book.";
+	mes "Congratulations!";
+	mes "You're not finally after alot of hard work, able to enter the halls of Valkyrie as an Professor!";
+	jobchange 40;
 	close;
-Lskpt:
+
+Skill_Points:
 	mes "[Professor]";
-	mes "Use your skillpoints first";
+	mes "Please use all of your skillpoints before proceeding.";
 	close;
-LCem:
+
+L_Advance:
 	mes "[Professor]";
-	mes "You're not ready to go to the next level";
-	close;	
-Lcancel:
-	mes "Bye";
+	mes "Hey there! You are already an Reborn. You cannot reach any higher";
+	mes "*whistles*";
 	close;
-}
+}
\ No newline at end of file
diff --git a/npc/jobs/2-2-1/Stalker.txt b/npc/jobs/2-2-1/Stalker.txt
index 176fef3db..fa23b6ac5 100644
--- a/npc/jobs/2-2-1/Stalker.txt
+++ b/npc/jobs/2-2-1/Stalker.txt
@@ -1,59 +1,118 @@
-//Stalker Made by Evera/Lorri
+// Advance Class jobchanger after kRO Normals.
+// Checks if the player have any questskills, cart\falcon, level and such.
+// Made by Nana.
+
+// -== Stalker ==-
 valkyrie.gat,53,58,4	script	Stalker	747,{
-	if (readparam(12) != 0) goto Lskpt;
-	if ((readparam(11) >= 99) && (Class == 18) && (JobLevel >= 50)) goto Lnovice;
-	if ((Class == 4001) && (readparam(55) >= 10)) goto Lh1;
-	if ((Class == 4001) && (readparam(55) < 10)) goto LCem;
-	if ((Class == 4007) && (readparam(55) >= 40)) goto Lh2;
-	if ((Class == 4007) && (readparam(55) < 40)) goto LCem;
-	if (Class == 4018) goto Lcrazy;
-	mes "[Stalker]";
-	mes "...";
-	close;
-Lnovice:
-	mes "[Stalker]";
-	mes "Hm. You seem like a person that would be interested. Would you want to become a stalker?";
-	mes "There is a catch though, you have to go back through novice and theif.";
-	mes "You wanna do it?";
-	menu "Yes",Lnovice2,"No",Lcancel;
-Lnovice2:
-	mes "We shall start the ceremony....";
-	next;
-	jobchange 24;// Job: Job_Novice_High
+	if(getskilllv(149) > 0) set @qsk,1;
+	if(getskilllv(150) > 0) set @qsk1,1;
+	if(getskilllv(151) > 0) set @qsk2,1;
+	if(getskilllv(152) > 0) set @qsk3,1;
+	if(checkcart(0) > 0) goto L_Cart;
+	if(readparam(12) > 0) goto Skill_Points;
+	if(readparam(19) >= 4008) goto L_Advance;
+	if((readparam(19) == 4001) && (readparam(55) >= 10)) goto L_HNov;
+	if((readparam(19) == 4007) && (readparam(55) >= 45)) goto L_HTHF;
+	if(readparam(19) < 7) goto L_Class;
+	if(readparam(19) == 4001) goto L_Class1;
+	if(readparam(19) == 4007) goto L_Class;
+	if((readparam(11) >= 99) && (readparam(55) >= 50) && (readparam(19) >= 7)) goto L_Change;
+	if((readparam(11) < 99) && (readparam(55) < 50)) goto L_Levels;
+	mes "[Stalker]";
+	mes "Hi there...";
+	close;
+
+L_Change:
+	mes "[Stalker]";
+	mes "Hello there "+strcharinfo(0)+"!";
+	mes "You've made a brave choice in coming here to be reborn and stepping forth into the ranks of Stalker,";
+	mes "I wish you good fortune in the near future!";
+	jobchange 24;
 	resetlvl(1);
 	close;
-Lh1:
+
+L_Cart:
 	mes "[Stalker]";
-	mes "Ready to become a theif?";
-	menu "Yes",Lh12,"No",Lcancel;
-Lh12:
+	mes "Please un-equip that cart before continuing.";
+	close;
+
+L_Class1:
 	mes "[Stalker]";
-	mes "Hmf.";
-	next;
-	jobchange 30;// Job: Job_Thief_High
+	mes "You're not ready to become an High thief yet.";
+	close;
+
+L_Class:
+	mes "[Stalker]";
+	mes "You've come far to get here. unfortunately, you're not ready to become an Stalker yet.";
+	close;
+
+L_Levels:
+	mes "[Stalker]";
+	mes "You're doing great! keep up the good work. You'll eventually get to the point where you can be an Stalker";
 	close;
-Lh2:
+
+L_HNov:
 	mes "[Stalker]";
-	mes "Hm. You're ready. Become a stalker?";
-	menu "Yes",Lh22,"No",Lcancel;
-Lh22:
+	mes "Tread lightly ahead as you're about to enter the distinguished world of Ragnarok.";
+	mes "Must great fortune follow you!";
+	jobchange 30;
+	next;
+	mes "[Stalker]";
+	mes "Let me just add in the missing Quest Skills you lost under the Reborn process if you had any, "+strcharinfo(0)+".";
+	next;
+	if(@qsk > 0) goto qsk;
+	if(@qsk1 > 0) goto qsk1;
+	if(@qsk2 > 0) goto qsk2;
+	if(@qsk3 > 0) goto qsk3;
+	next;
+qsk:
+	skill 149,1,0;
+	set @qsk,0;
+	if(@qsk1 > 0) goto qsk1;
+	if(@qsk2 > 0) goto qsk2;
+	if(@qsk3 > 0) goto qsk3;
+	goto L_HNov_2;
+qsk1:
+	skill 150,1,0;
+	set @qsk1,0;
+	if(@qsk > 0) goto qsk;
+	if(@qsk2 > 0) goto qsk2;
+	if(@qsk3 > 0) goto qsk3;
+	goto L_HNov_2;
+qsk2:
+	skill 151,1,0;
+	set @qsk2,0;
+	if(@qsk > 0) goto qsk;
+	if(@qsk1 > 0) goto qsk1;
+	if(@qsk3 > 0) goto qsk3;
+	goto L_HNov_2;
+qsk3:
+	skill 152,1,0;
+	set @qsk3,0;
+	if(@qsk > 0) goto qsk;
+	if(@qsk1 > 0) goto qsk1;
+	if(@qsk2 > 0) goto qsk2;
+	goto L_HNov_2;
+
+L_HNov_2:
 	mes "[Stalker]";
-	mes "Hmf.";
-	jobchange 41;// Job: Job_Stalker
+	mes "Now when the formalities are fixed, I congratulate you on your Advancement to High Thief";
 	close;
-Lcrazy:
+L_HTHF:
 	mes "[Stalker]";
-	mes "I'm done with you.";
+	mes "Congratulations!";
+	mes "You're not finally after alot of hard work, able to enter the halls of Valkyrie as an Stalker!";
+	jobchange 41;
 	close;
-Lskpt:
+
+Skill_Points:
 	mes "[Stalker]";
-	mes "Use your skillpoints first";
+	mes "Please use all of your skillpoints before proceeding.";
 	close;
-LCem:
+
+L_Advance:
 	mes "[Stalker]";
-	mes "You're not ready to go to the next level";
-	close;	
-Lcancel:
-	mes "Bye";
+	mes "Hey there! You are already an Reborn. You cannot reach any higher";
+	mes "*whistles*";
 	close;
-}
+}
\ No newline at end of file