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, 104 insertions, 56 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