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

6 files changed, 531 insertions, 297 deletions

diff --git a/npc/jobs/2-1-1/AssassinCross.txt b/npc/jobs/2-1-1/AssassinCross.txt
index d46fa2d70..adf202371 100644
--- a/npc/jobs/2-1-1/AssassinCross.txt
+++ b/npc/jobs/2-1-1/AssassinCross.txt
@@ -1,70 +1,118 @@
-//Assasin Cross 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.
+
+// -== Assassin Cross ==-
 valkyrie.gat,44,58,6	script	Assassin Cross	725,{
-	if ((readparam(11)>=99) && (readparam(19)==12) && (readparam(55) >= 50)) goto Lnovice;
-	if ((readparam(19)==4001) && (readparam(55) >= 10)) goto Lhtheif;
-	if ((readparam(19)==4001) && (readparam(55) < 10)) goto LCem;
-	if ((readparam(19)==4007) && (readparam(55) >= 40)) goto Lhsin;
-	if ((readparam(19)==4007)  && (readparam(55) < 40)) goto LCem;
-	if ((readparam(19)) && (readparam(19))) goto LCongrats;
-	if (readparam(19)==4013) goto Lcrazy;
-	if (readparam(12) != 0) goto Lskpt;
-	mes "[Assasin Cross]";
-	mes "Who are you?";
-	mes "Meet all the req. first.";
+	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 "[Assassin Cross]";
+	mes "Hi there...";
 	close;
-Lnovice:
-	mes "[Assasin Cross]";
-	mes "Now, here's the deal. I change you into a High Novice.";
-	mes "You come back to become a High Theif, then become an Assassin Cross.";
-	mes "You wanna do it?";
-	menu "Yes",Lnovice2,"No",Lcancel;
-Lnovice2:
-	mes "We shall start the ceremony....";
-	next;
-	jobchange 24;// Job: Job_Novice_High
+
+L_Change:
+	mes "[Assassin Cross]";
+	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 Assassin Cross,";
+	mes "I wish you good fortune in the near future!";
+	jobchange 24;
 	resetlvl(1);
 	close;
-Lhtheif:
-	mes "[Assasin Cross]";
-	mes "Wanna become a High Theif?";
-	menu "Yes",Lhtheif2,"No",Lcancel;
-Lhtheif2:
-	mes "[Assasin Cross]";
-	mes "We shall start the ceremony....";
-	next;
-	jobchange 30;// Job: Job_Thief_High
-	close;
-Lhsin:
-	mes "[Assasin Cross]";
-	mes "Ready to become a Assassin Cross?";
-	menu "Yes",Lhsin2,"No",Lcancel;
-Lhsin2:
-	mes "[Assasin Cross]";
-	mes "We shall start the ceremony....";
-	jobchange 36;// Job: Job_Assassin_Cross
+
+L_Cart:
+	mes "[Assassin Cross]";
+	mes "Please un-equip that cart before continuing.";
 	close;
-Lcrazy:
+
+L_Class1:
 	mes "[Assassin Cross]";
-	mes "We shall start the ceremony....";
-	next;
+	mes "You're not ready to become an High thief yet.";
+	close;
+
+L_Class:
 	mes "[Assassin Cross]";
-	mes "You've already gone to the next level";
+	mes "You've come far to get here. unfortunately, you're not ready to become an Assassin Cross yet.";
 	close;
-Lskpt:
-	mes "[Assasin Cross]";
-	mes "Use your skillpoints first";
+
+L_Levels:
+	mes "[Assassin Cross]";
+	mes "You're doing great! keep up the good work. You'll eventually get to the point where you can be an Assassin Cross";
 	close;
-LCem:
-	mes "We shall start the ceremony....";
+
+L_HNov:
+	mes "[Assassin Cross]";
+	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 "[Assassin Cross]";
+	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 "[Assassin Cross]";
-	mes "You're not ready to go to the next level";
+	mes "Now when the formalities are fixed, I congratulate you on your Advancement to High Thief";
 	close;
-LCongrats:
-	mes "Congratulations on your victory.";
-	mes "May you and others have honor and glory!";
+L_HTHF:
+	mes "[Assassin Cross]";
+	mes "Congratulations!";
+	mes "You're not finally after alot of hard work, able to enter the halls of Valkyrie as an Assassin Cross!";
+	jobchange 36;
+	close;
+
+Skill_Points:
+	mes "[Assassin Cross]";
+	mes "Please use all of your skillpoints before proceeding.";
 	close;
-Lcancel:
-	mes "Bye";
+
+L_Advance:
+	mes "[Assassin Cross]";
+	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-1-1/HighPriest.txt b/npc/jobs/2-1-1/HighPriest.txt
index ba569125e..db0c4c21b 100644
--- a/npc/jobs/2-1-1/HighPriest.txt
+++ b/npc/jobs/2-1-1/HighPriest.txt
@@ -1,61 +1,88 @@
-//High Priest 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.
+
+// -== High Priest ==-
 valkyrie.gat,44,42,6	script	High Priest	60,{
-	if ((readparam(11) >= 99) && (readparam(19) == 8) && (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) == 4009) goto Lcrazy;
-	if (readparam(12) != 0) goto Lskpt;
-	mes "[High Priest]";
-	mes "Hello";
-	mes "God bless you.";
-	close;
-Lnovice:
-	mes "[High Priest]";
-	mes "Hi! I'm a little different from you, have you noticed?";
-	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 "[High Priest]";
+	mes "Hi there...";
+	close;
+
+L_Change:
+	mes "[High Priest]";
+	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 High Priest,";
+	mes "I wish you good fortune in the near future!";
+	jobchange 24;
 	resetlvl(1);
 	close;
-Lh1:
+
+L_Cart:
 	mes "[High Priest]";
-	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 "[High Priest]";
-	mes "God please bestow this enlightened soul with a drip of your mighty power.";
-	next;
-	jobchange 28;// Job: Job_Acolyte_High
+	mes "You're not ready to become an Acolyte High yet...";
+	close;
+
+L_Class:
+	mes "[High Priest]";
+	mes "You've come far to get here. unfortunately, you're not ready to become an High Priest yet.";
+	close;
+
+L_Levels:
+	mes "[High Priest]";
+	mes "You're doing great! keep up the good work. You'll eventually get to the point where you can be an High Priest";
 	close;
-Lh2:
+
+L_HNov:
 	mes "[High Priest]";
-	mes "Your holy power grows stronger. Will you become a high priest?";
-	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 28;
+	next;
+	mes "[High Priest]";
+	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;
+
+L_HNov_2:
 	mes "[High Priest]";
-	mes "God please bestow this enlightened soul with a drip of your mighty power.";
-	jobchange 32;// Job: Job_High_Priest
+	mes "Now when the formalities are fixed, I congratulate you on your Advancement to Acolyte High";
 	close;
-Lcrazy:
+L_HACO:
 	mes "[High Priest]";
-	mes "Nice day isn't it?";
+	mes "Congratulations!";
+	mes "You're not finally after alot of hard work, able to enter the halls of Valkyrie as an High Priest!";
+	jobchange 32;
 	close;
-Lskpt:
+
+Skill_Points:
 	mes "[High Priest]";
-	mes "Use your skillpoints first";
+	mes "Please use all of your skillpoints before proceeding.";
 	close;
-LCem:
+
+L_Advance:
 	mes "[High Priest]";
-	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-1-1/HighWizard.txt b/npc/jobs/2-1-1/HighWizard.txt
index 356c287b4..acf51c225 100644
--- a/npc/jobs/2-1-1/HighWizard.txt
+++ b/npc/jobs/2-1-1/HighWizard.txt
@@ -1,60 +1,88 @@
-//High Wizard 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.
+
+// -== High Wizard ==-
 valkyrie.gat,44,47,6	script	High Wizard	735,{
-	if ((readparam(11) >= 99) && (readparam(19) == 9) && (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) == 4010) goto Lcrazy;
-	if (readparam(12) != 0) goto Lskpt;
-	mes "[High Wizard]";
-	mes "Hello";
-	mes "The magic surrounds you.";
-	close;
-Lnovice:
-	mes "[High Wizard]";
-	mes "Hey you! It appears that your intelligence is very high. Would you like to become a high wizard 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 "[High Wizard]";
+	mes "Hi there...";
+	close;
+
+L_Change:
+	mes "[High Wizard]";
+	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 High Wizard,";
+	mes "I wish you good fortune in the near future!";
+	jobchange 24;
 	resetlvl(1);
 	close;
-Lh1:
+
+L_Cart:
 	mes "[High Wizard]";
-	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 "[High Wizard]";
-	mes "The magic enchants and suppresses you.";
-	next;
-	jobchange 26;// Job: Job_Mage_High
+	mes "You're not ready to become an High Mage yet.";
+	close;
+
+L_Class:
+	mes "[High Wizard]";
+	mes "You've come far to get here. unfortunately, you're not ready to become an High Wizard yet.";
+	close;
+
+L_Levels:
+	mes "[High Wizard]";
+	mes "You're doing great! keep up the good work. You'll eventually get to the point where you can be an High Wizard";
 	close;
-Lh2:
+
+L_HNov:
 	mes "[High Wizard]";
-	mes "The magic grows strong in you. You appear ready. Will you become a high wizard?";
-	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 "[High Wizard]";
+	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 "[High Wizard]";
-	mes "The magic enchants and suppresses you.";
-	jobchange 33;// Job: Job_High_Wizard
+	mes "Now when the formalities are fixed, I congratulate you on your Advancement to High Mage";
 	close;
-Lcrazy:
+L_HMAG:
 	mes "[High Wizard]";
-	mes "I cannot bestow you with more of my magic.";
+	mes "Congratulations!";
+	mes "You're not finally after alot of hard work, able to enter the halls of Valkyrie as an High Wizard!";
+	jobchange 33;
 	close;
-Lskpt:
+
+Skill_Points:
 	mes "[High Wizard]";
-	mes "Use your skillpoints first";
+	mes "Please use all of your skillpoints before proceeding.";
 	close;
-LCem:
+
+L_Advance:
 	mes "[High Wizard]";
-	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-1-1/LordKnight.txt b/npc/jobs/2-1-1/LordKnight.txt
index 705d55b52..9dbeaa345 100644
--- a/npc/jobs/2-1-1/LordKnight.txt
+++ b/npc/jobs/2-1-1/LordKnight.txt
@@ -1,62 +1,107 @@
-//Lord Knight 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.
+
+// -== Lord Knight ==-
 valkyrie.gat,44,39,6	script	Lord Knight	56,{
-	if ((readparam(11) >= 99) && (readparam(19) == 7) && (readparam(55) >= 50)) goto Lnovice;
-	if ((readparam(11) >= 99) && (readparam(19) == 13) && (readparam(55) >= 50)) goto Lnovice;
-	if ((readparam(19) == 4001) && (readparam(55) >= 10)) goto Lhsword;
-	if ((readparam(19) == 4001) && (readparam(55) < 10)) goto LCem;
-	if ((readparam(19) == 4002) && (readparam(55) >= 40)) goto Lhkni;
-	if ((readparam(19) == 4002) && (readparam(55) < 40)) goto LCem;
-	if (readparam(19) == 4008) goto Lcrazy;
-	if (readparam(12) != 0) goto Lskpt;
-	mes "[Lord Knight]";
-	mes "Hello";
-	mes "It's a nice day, isnt it?";
-	close;
-Lnovice:
-	mes "[Lord Knight]";
-	mes "The honor a knight carries is high, but there is something beyond that. The lord knight.";
-	mes "You come back to become a High Swordsman, then become a Lord Knight.";
-	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 "[Lord Knight]";
+	mes "Hi there...";
+	close;
+
+L_Change:
+	mes "[Lord Knight]";
+	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 Lord Knight,";
+	mes "I wish you good fortune in the near future!";
+	jobchange 24;
 	resetlvl(1);
 	close;
-Lhsword:
+
+L_Cart:
 	mes "[Lord Knight]";
-	mes "Ready to become a high swordsman??";
-	menu "Yes",Lhsword2,"No",Lcancel;
-Lhsword2:
+	mes "Please un-equip that cart before continuing.";
+	close;
+
+L_Class1:
 	mes "[Lord Knight]";
-	mes "By the vow of my sword, here is the one bestowed upon with the truthful heart";
-	next;
-	jobchange 25;// Job: Job_Swordman_High
+	mes "You're not ready to become an High Swordsman yet.";
+	close;
+
+L_Class:
+	mes "[Lord Knight]";
+	mes "You've come far to get here. unfortunately, you're not ready to become an Lord Knight yet.";
+	close;
+
+L_Levels:
+	mes "[Lord Knight]";
+	mes "You're doing great! keep up the good work. You'll eventually get to the point where you can be an Lord Knight";
 	close;
-Lhkni:
+
+L_HNov:
 	mes "[Lord Knight]";
-	mes "The final step in a knight's quest for honor. Will you become a lord knight?";
-	menu "Yes",Lhkni2,"No",Lcancel;
-Lhkni2:
+	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 "[Lord Knight]";
+	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 "[Lord Knight]";
-	mes "By the vow of my sword, here is the one bestowed upon with the truthful heart";
-	jobchange 31;// Job: Job_Lord_Knight
+	mes "Now when the formalities are fixed, I congratulate you on your Advancement to High Swordsman";
 	close;
-Lcrazy:
+L_HSWM:
 	mes "[Lord Knight]";
-	mes "Nice day isn't it?";
+	mes "Congratulations!";
+	mes "You're not finally after alot of hard work, able to enter the halls of Valkyrie as an Lord Knight!";
+	jobchange 31;
 	close;
-Lskpt:
+
+Skill_Points:
 	mes "[Lord Knight]";
-	mes "Use your skillpoints first";
+	mes "Please use all of your skillpoints before proceeding.";
 	close;
-LCem:
+
+L_Advance:
 	mes "[Lord Knight]";
-	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-1-1/Sniper.txt b/npc/jobs/2-1-1/Sniper.txt
index 32468bfae..3b39fb628 100644
--- a/npc/jobs/2-1-1/Sniper.txt
+++ b/npc/jobs/2-1-1/Sniper.txt
@@ -1,64 +1,104 @@
-//Sniper 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.
+
+// -== Sniper ==-
 valkyrie.gat,44,55,6	script	Sniper	727,{
-	if ((readparam(11) >= 99) && (Class == 11) && (JobLevel >= 50)) goto Lnovice;
-	if ((Class == 4001) && (readparam(55) >= 10)) goto Lharcher;
-	if ((Class == 4001) && (readparam(55) < 10)) goto LCem;
-	if ((Class == 4004) && (readparam(55) >= 40)) goto Lhsni;
-	if ((Class == 4004) && (readparam(55) < 40)) goto LCem;
-	if (Class == 4012) goto Lcrazy;
+	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 "[Sniper]";
-	mes "Who are you?";
-	mes "Only the archer class can become a Sniper...";
-	mes "Meet all the requirements first.";
+	mes "Hi there...";
 	close;
-Lnovice:
+
+L_Change:
 	mes "[Sniper]";
-	mes "Now, here's the deal. I change you into a High Novice.";
-	mes "You come back to become a Sniper, then become a sniper.";
-	mes "You wanna do it?";
-	menu "Yes",Lnovice2,"No",Lcancel;
-Lnovice2:
-	if (readparam(12) != 0) goto Lskpt;
-	mes "By the tip of my arrow.. The distance it moves...";
-	next;
-	jobchange 24;// Job: Job_Novice_High
+	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 Sniper,";
+	mes "I wish you good fortune in the near future!";
+	jobchange 24;
 	resetlvl(1);
 	close;
-Lharcher:
+
+L_Cart:
 	mes "[Sniper]";
-	mes "Wanna become a High Arhcer?";
-	menu "Yes",Lhtheif2,"No",Lcancel;
-Lhtheif2:
-	if (readparam(12) != 0) goto Lskpt;
+	mes "Please un-equip that cart before continuing.";
+	close;
+
+L_Class1:
 	mes "[Sniper]";
-	mes "By the tip of my arrow.. The distance it moves...";
-	next;
-	jobchange 27;// Job: Job_Archer_High
+	mes "You're not ready to become an High Archer yet.";
+	close;
+
+L_Class:
+	mes "[Sniper]";
+	mes "You've come far to get here. unfortunately, you're not ready to become an Sniper yet.";
+	close;
+
+L_Levels:
+	mes "[Sniper]";
+	mes "You're doing great! keep up the good work. You'll eventually get to the point where you can be an Sniper";
 	close;
-Lhsni:
+
+L_HNov:
 	mes "[Sniper]";
-	mes "Ready to become a sniper, like me??";
-	menu "Yes",Lhsni2,"No",Lcancel;
-Lhsni2:
-	if (readparam(12) != 0) goto Lskpt;
+	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 "[Sniper]";
+	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 "[Sniper]";
+	mes "Now when the formalities are fixed, I congratulate you on your Advancement to High Archer";
+	close;
+L_HARC:
 	mes "[Sniper]";
-	mes "By the tip of my arrow.. The distance it moves...";
-	jobchange 35;// Job: Job_Sniper
+	mes "Congratulations!";
+	mes "You're not finally after alot of hard work, able to enter the halls of Valkyrie as an Sniper!";
+	jobchange 35;
 	close;
-Lcrazy:
+
+Skill_Points:
 	mes "[Sniper]";
-	mes "You're already a Sniper!";
-	mes "How are you doing?";
+	mes "Please use all of your skillpoints before proceeding.";
 	close;
-Lskpt:
+
+L_Advance:
 	mes "[Sniper]";
-	mes "Please finish up your skillpoints first";
+	mes "Hey there! You are already an Reborn. You cannot reach any higher";
+	mes "*whistles*";
 	close;
-LCem:
+
+L_Falcon:
 	mes "[Sniper]";
-	mes "Please train your arrows to move faster.";
-	close;	
-Lcancel:
-	mes "Bye";
+	mes "Please take your Falcon off before proceeding "+strcharinfo(0)+".";
 	close;
-}
+}
\ No newline at end of file
diff --git a/npc/jobs/2-1-1/WhiteSmith.txt b/npc/jobs/2-1-1/WhiteSmith.txt
index d65900f69..29b483eda 100644
--- a/npc/jobs/2-1-1/WhiteSmith.txt
+++ b/npc/jobs/2-1-1/WhiteSmith.txt
@@ -1,60 +1,106 @@
-//Whitesmith Made by Evera/Lorri
-valkyrie.gat,44,50,6	script	Whitesmith	731,{
-	if ((readparam(11) >= 99) && (readparam(19) == 10) && (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) == 4010) goto Lcrazy;
-	if (readparam(12) != 0) goto Lskpt;
-	mes "[Whitesmith]";
-	mes "Hello";
-	mes "I am not currently available for forging, please ask another forger.";
-	close;
-Lnovice:
-	mes "[Whitesmith]";
-	mes "Hm. You weild your hammer pretty good. You wanna become a whitesmith?";
-	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
+// Advance Class jobchanger after kRO Normals.
+// Checks if the player have any questskills, cart\falcon, level and such.
+// Made by Nana.
+
+// -== White Smith ==-
+valkyrie.gat,44,58,6	script	White Smith	725,{
+	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 "[White Smith]";
+	mes "Hi there...";
+	close;
+
+L_Change:
+	mes "[White Smith]";
+	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 White Smith,";
+	mes "I wish you good fortune in the near future!";
+	jobchange 24;
 	resetlvl(1);
 	close;
-Lh1:
-	mes "[Whitesmith]";
-	mes "Ready to become a high merchant?";
-	menu "Yes",Lh12,"No",Lcancel;
-Lh12:
-	mes "[Whitesmith]";
-	mes "You're on your way to making upgraded items.";
+
+L_Cart:
+	mes "[White Smith]";
+	mes "Please un-equip that cart before continuing.";
+	close;
+
+L_Class1:
+	mes "[White Smith]";
+	mes "You're not ready to become an High Merchant yet.";
+	close;
+
+L_Class:
+	mes "[White Smith]";
+	mes "You've come far to get here. unfortunately, you're not ready to become an White Smith yet.";
+	close;
+
+L_Levels:
+	mes "[White Smith]";
+	mes "You're doing great! keep up the good work. You'll eventually get to the point where you can be an White Smith";
+	close;
+
+L_HNov:
+	mes "[White Smith]";
+	mes "Tread lightly ahead as you're about to enter the distinguished world of Ragnarok.";
+	mes "Must great fortune follow you!";
+	jobchange 29;
 	next;
-	jobchange 29;// Job: Job_Merchant_High
-	close;
-Lh2:
-	mes "[Whitesmith]";
-	mes "Hey, you've grown a lot. Will you become a whitesmith?";
-	menu "Yes",Lh22,"No",Lcancel;
-Lh22:
-	mes "[Whitesmith]";
-	mes "The magic enchants and suppresses you.";
-	jobchange 34;// Job: Job_Whitesmith
-	close;
-Lcrazy:
-	mes "[Whitesmith]";
-	mes "Hm. You look like me.";
-	close;
-Lskpt:
-	mes "[Whitesmith]";
-	mes "Use your skillpoints first";
-	close;
-LCem:
-	mes "[Whitesmith]";
-	mes "You're not ready to go to the next level";
-	close;	
-Lcancel:
-	mes "Bye";
-	close;
-}
+	mes "[White Smith]";
+	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 "[White Smith]";
+	mes "Now when the formalities are fixed, I congratulate you on your Advancement to High Merchant";
+	close;
+L_HMERC:
+	mes "[White Smith]";
+	mes "Congratulations!";
+	mes "You're not finally after alot of hard work, able to enter the halls of Valkyrie as an White Smith!";
+	jobchange 34;
+	close;
+
+Skill_Points:
+	mes "[White Smith]";
+	mes "Please use all of your skillpoints before proceeding.";
+	close;
+
+L_Advance:
+	mes "[White Smith]";
+	mes "Hey there! You are already an Reborn. You cannot reach any higher";
+	mes "*whistles*";
+	close;
+}
\ No newline at end of file