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

1 files changed, 103 insertions, 57 deletions

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