Completed full save/restore of Quest Skills on the REBIRTHING 8)

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

1 files changed, 47 insertions, 73 deletions

diff --git a/npc/cities/valkyrie.txt b/npc/cities/valkyrie.txt
index e4790886b..c80f76c9e 100644
--- a/npc/cities/valkyrie.txt
+++ b/npc/cities/valkyrie.txt
@@ -4,7 +4,7 @@
 //= Nana, fixes by Poki

 //= finished, optimized and tested by Lupus

 //===== Current Version: ===================================== 

-//= 2.1

+//= 2.2

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

 //= eAthena 1.0 +

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

@@ -26,6 +26,7 @@
 //= 2.0 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon]

 //= 2.0b Fixed. TODO: add new Quest Skills [Lupus]

 //= 2.1 Changed all numbers into constants. [Vicious]

+//= 2.2 Now ALL quests skills are saved/restored [Lupus]

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

 

 

@@ -119,26 +120,24 @@ M_EXIT:
 // -== The Heart of Ymir ==-

 yuno_in05.gat,50,44,0	script	Heart of Ymir	111,{

 	mes "[Heart of Ymir]";

-	if(valkyrie_Q == 1) goto L_LISTEN;

-	if(valkyrie_Q == 2) goto L_DONE;

+	if(valkyrie_Q == 1){

+		mes "Thus upon hard times and when our self esteem is at its lowest, then is when our faith has to be the strongest.";

+		mes "For aeons the secret guardians of the path to heaven have protected the secret gate from evil spirits entering it.";

+		mes "Thus, the bonds became to weaken over time... That's when the Legion of Sages started recruiting and making young, brave and quick minded mages and sages, teaching them the laws and propositions of our world.";

+		next;

+		mes "[Heart of Ymir]";

+		mes "Aeons passed and the Sages grew stronger in both mind and forces, until they all were feared throughout the monsters' world.";

+		mes "Now, after listening to my words of wisdom, please advance to the Book of Ymir and give yourself into God's light.";

+		mes "If you are pure of heart and have no evil intentions, the gates of dawn will open for you and take you in...";

+		set valkyrie_Q,2;

+		close;

+	}

+	if(valkyrie_Q == 2){

+		mes "I have nothing more to teach you, nor to tell you.";

+		close;

+	}

 	mes ". . .";

 	close;

-

-L_LISTEN:

-	mes "Thus upon hard times and when our self esteem is at its lowest, then is when our faith has to be the strongest.";

-	mes "For aeons the secret guardians of the path to heaven have protected the secret gate from evil spirits entering it.";

-	mes "Thus, the bonds became to weaken over time... That's when the Legion of Sages started recruiting and making young, brave and quick minded mages and sages, teaching them the laws and propositions of our world.";

-	next;

-	mes "[Heart of Ymir]";

-	mes "Aeons passed and the Sages grew stronger in both mind and forces, until they all were feared throughout the monsters' world.";

-	mes "Now, after listening to my words of wisdom, please advance to the Book of Ymir and give yourself into God's light.";

-	mes "If you are pure of heart and have no evil intentions, the gates of dawn will open for you and take you in...";

-	set valkyrie_Q,2;

-	close;

-

-L_DONE:

-	mes "I have nothing more to teach you, nor to tell you.";

-	close;

 }

 

 // -== Researcher of the Book of Ymir ==-

@@ -152,12 +151,6 @@ yuno_in02.gat,90,77,4	script	Researcher	744,{
 }

 

 // -== Valhallana ==-

-//	mes "Please go over there, to the person representing your class.";

-//	mes "Good Luck.";

-//	mes "You don't belong here yet.";

-//}

-

-// -== Valhallana ==-

 valkyrie.gat,48,86,6	script	Valkyrie	811,{

 	mes "[Valhallana]";

 	if(BaseJob == Job_SuperNovice) goto L_SN;

@@ -200,7 +193,7 @@ L_SN:
 L_ALREADY:

 	mes "I can't help you anymore.";

 	if(Class == Job_Novice_High) mes "You have been reborn already.";

-	if(Class >= Job_Swordman_High && Class <= Job_Thief_High) mes "Go and ask these people in the hall.";

+	if(Class >= Job_Swordman_High && Class <= Job_Thief_High) mes "Please go over there, to the person representing your class.";

 	next;

 

 L_NOTHING:

@@ -225,28 +218,12 @@ L_CHANGE:
 	mes "Let's start your reincarnation ceremony...";

 	next;

 

-	set ADVJOB,Class+4001; //memo the target 3rd Job ID

+	set ADVJOB, Class+Job_Novice_High; //memo the target 3rd Job ID

 	if(ADVJOB == Job_Lord_Knight2) set ADVJOB,Job_Lord_Knight;

 	if(ADVJOB == Job_Paladin2) set ADVJOB,Job_Paladin;

 

-//	callfunc "F_ToHigh",25,"Swordman High",31,"Lord Knight",144,145,146,0;

-//	callfunc "F_ToHigh",28,"Acolyte High",32,"High Priest",156,0,0,0;

-//	callfunc "F_ToHigh",26,"High Mage",33,"High Wizard",157,0,0,0;

-//	callfunc "F_ToHigh",29,"Merchant High",34,"White Smith",153,154,155,0;

-//	callfunc "F_ToHigh",27,"High Archer",35,"Sniper",147,148,0,0;

-//	callfunc "F_ToHigh",30,"Thief High",36,"Assassin Cross",149,150,151,152;

-//	callfunc "F_ToHigh",25,"Swordman High",38,"Paladin",144,145,146,0;

-//	callfunc "F_ToHigh",28,"Acolyte High",39,"Champion",156,0,0,0;

-//	callfunc "F_ToHigh",26,"High Mage",40,"Professor",157,0,0,0;

-//	callfunc "F_ToHigh",30,"Thief High",41,"Stalker",149,150,151,152;

-//	callfunc "F_ToHigh",29,"Merchant High",42,"Creator",153,154,155,0;

-//	callfunc "F_ToHigh",27,"High Archer",43,"Clown",147,148,0,0;

-//	callfunc "F_ToHigh",27,"High Archer",44,"Gypsy",147,148,0,0;

-

-	if( getskilllv(144) || getskilllv(156) || getskilllv(157) || getskilllv(153) || getskilllv(147) || getskilllv(149) ) set QSK1,1;

-	if( getskilllv(145) || getskilllv(154) || getskilllv(148) || getskilllv(150) ) set QSK2,1;

-	if( getskilllv(146) || getskilllv(155) || getskilllv(151) ) set QSK3,1;

-	if( getskilllv(152) ) set QSK4,1;

+	callfunc("F_SaveQuestSkills");

+

 	mes "[Valhallana]";

 	mes "Done...";

 	mes "Good luck.";

@@ -318,12 +295,7 @@ L_SKILLPNTS:
 //getarg(0) - High Job ID

 //getarg(1) - High Job Name

 //getarg(2) - 3rd Job ID

-//getarg(3) - 3rd Job Name

-//getarg(4) - Quest Skill N? You can pass 0, if there's no Quest Skill

-//getarg(5) - Quest Skill N?

-//getarg(6) - Quest Skill N?

-//getarg(7) - Quest Skill N?

-//getarg(8) - current NPC's name

+//getarg(3) - current NPC's name

 

 function	script	F_ToHigh	{

 	if(Upper == 2) return; //Baby Class - skip it

@@ -340,12 +312,14 @@ function	script	F_ToHigh	{
 	if(Class == getarg(0)) goto L_WELCOME; //3rd Job

 	if(Class >= Job_Lord_Knight && Class <= Job_Paladin2) goto L_ALREADY; //already advanced class

 	if(Class == Job_Novice_High && @fjob == getarg(2)) goto L_GETHIGH; //High Novice -> High XXXX

-	if(Class == Job_Novice_High) mes "Hello, Novice High! If you are going to became a "+getarg(1)+", then go visit your very first job teacher.";

-	if(Class == Job_Novice_High) close;

+	if(Class == Job_Novice_High) {

+		mes "Hello, Novice High! If you are going to became a "+getarg(1)+", then go visit your very first job teacher.";

+		close;

+	}

 	return; //this char doesn't want to get HIGH class

 

 L_GETHIGH:

-	mes "["+getarg(8)+"]";

+	mes "["+getarg(3)+"]";

 	if(JobLevel < 10) goto L_NOTREADY;

 	if(checkcart(0)) goto L_CART;

 	if(checkfalcon(0)) goto L_FALCON;

@@ -356,27 +330,19 @@ L_GETHIGH:
 	mes "You've made a brave choice in coming here to be reborn and stepping forth into the advanced ranks.";

 	mes "Now... close your eyes.";

 	next;

-	mes "["+getarg(8)+"]";

+	mes "["+getarg(3)+"]";

 	mes "Open your eyes.";

 	mes "You have become a "+getarg(1)+".";

 	jobchange getarg(0); //High Class

 	next;

-	if(!(QSK1 || QSK2 || QSK3 || QSK4)) goto L_NO_QSKILL;

-	mes "["+getarg(8)+"]";

-	mes "Let me just add in the missing Quest Skills you lost under the Reborn process, "+strcharinfo(0)+".";

-	next;

-//return learnt quest skills

-	if(getarg(4)) skill getarg(4),QSK1,0;

-	set SQK1,0;

-	if(getarg(5)) skill getarg(5),QSK2,0;

-	set SQK2,0;

-	if(getarg(6)) skill getarg(6),QSK3,0;

-	set SQK3,0;

-	if(getarg(7)) skill getarg(7),QSK4,0;

-	set SQK4,0;

-

-L_NO_QSKILL:

-	mes "["+getarg(8)+"]";

+	if(ADV_QSK){

+		mes "["+getarg(3)+"]";

+		mes "Let me just add in the missing Quest Skills you lost under the Reborn process, "+strcharinfo(0)+".";

+		next;

+		//return learnt quest skills

+		callfunc("F_Load1Skills");

+	}

+	mes "["+getarg(3)+"]";

 	mes "I wish you good fortune in the near future!";

 	emotion e_grat;

 	close;

@@ -408,13 +374,13 @@ L_PECO:
 	close;

 

 L_WELCOME:

-	mes "["+getarg(8)+"]";

+	mes "["+getarg(3)+"]";

 	mes "You are welcome, "+strcharinfo(0)+"!";

 	mes "We're always glad to see a "+getarg(1)+" here!";

 	close;

 

 L_ALREADY:

-	mes "["+getarg(8)+"]";

+	mes "["+getarg(3)+"]";

 	mes "It's such a big honor to salute envoys of Valhalla.";

 	mes "Come again.";

 	emotion e_ho;

@@ -446,6 +412,14 @@ L_GET3RD:
 	mes "You have trained well. Now stroll here as a "+getarg(3)+"!";

 	jobchange getarg(2); //Rebirth Class

 	set ADVJOB,0;

+	if(ADV_QSK2){

+		next;

+		mes "["+getarg(3)+"]";

+		mes "Let me just add in the missing Quest Skills you lost under the Reborn process, "+strcharinfo(0)+".";

+		next;

+		//return learnt quest skills

+		callfunc("F_Load2Skills");

+	}

 	close;

 

 L_NOTREADY: