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

6 files changed, 17 insertions, 11 deletions

diff --git a/npc/jobs/1-1/acolyte.txt b/npc/jobs/1-1/acolyte.txt
index e34f7bd4c..52a7a4207 100644
--- a/npc/jobs/1-1/acolyte.txt
+++ b/npc/jobs/1-1/acolyte.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= kobra_k88

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

-//= 1.4

+//= 1.5

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

 //= eAthena 1.0 +

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

@@ -15,12 +15,13 @@
 //= v1.2a Added instant job change for High Novice [Lupus]

 //= v1.3 Added Baby Class support [Lupus]

 //= v1.4 Optimised and moved first checker to Jfunc1-1 [massdriller]

+//= 1.5 Now saves/restores all quest skills [Lupus]

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

 

 

 // -- Father Mareusis --

 prt_church.gat,184,41,4	script	Father Mareusis	60,{

-	callfunc "F_ToHigh",Job_Acolyte_High,"Acolyte High",Job_High_Priest,"High Priest",156,0,0,0,"Father Mareusis";

+	callfunc "F_ToHigh",Job_Acolyte_High,"Acolyte High",Job_High_Priest,"Father Mareusis";

 	mes "[Father Mareusis]";

 	if(BaseJob==Job_Novice && job_acolyte_q > 0) goto L_Check;

 	mes "What is it you are looking for?";

diff --git a/npc/jobs/1-1/archer.txt b/npc/jobs/1-1/archer.txt
index 87d390105..1f57a5227 100644
--- a/npc/jobs/1-1/archer.txt
+++ b/npc/jobs/1-1/archer.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= kobra_k88

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

-//= 1.4

+//= 1.5

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

 //= eAthena 1.0 +

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

@@ -13,12 +13,13 @@
 //= v1.1 Added instant job change for High Novice [Lupus]

 //= v1.3 Added Baby Class support [Lupus]

 //= v1.4 Optimised and moved first checker to Jfunc1-1 [massdriller]

+//= 1.5 Now saves/restores all quest skills [Lupus]

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

 

 

 // -- Archer Guildsman -- 

 payon_in02.gat,64,71,4	script	Archer Guildsman	59,{

-	callfunc "F_ToHigh",Job_Archer_High,"High Archer",Job_Sniper,"Sniper",147,148,0,0,"Archer Guildsman";

+	callfunc "F_ToHigh",Job_Archer_High,"High Archer",Job_Sniper,"Archer Guildsman";

 	mes "[Archer Guildsman]";

 	if(BaseJob==Job_Novice && job_archer_q == 1) goto L_Check;

 	mes "Good Day. How may I help you?";

diff --git a/npc/jobs/1-1/mage.txt b/npc/jobs/1-1/mage.txt
index 8ed741ae2..e6ce82f2b 100644
--- a/npc/jobs/1-1/mage.txt
+++ b/npc/jobs/1-1/mage.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= kobra_k88

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

-//= 1.4

+//= 1.5

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

 //= eAthena 1.0 +

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

@@ -14,12 +14,13 @@
 //= v1.2 Added instant job change for High Novice [Lupus]

 //= 1.3 Added Baby Class support [Lupus]

 //= v1.4 Optimised and moved first checker to Jfunc1-1 [massdriller]

+//= 1.5 Now saves/restores all quest skills [Lupus]

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

 

 

 // -- Expert Mage -- 

 geffen_in.gat,164,124,4	script	Expert Mage	123,{

-	callfunc "F_ToHigh",Job_Mage_High,"High Mage",Job_High_Wizard,"High Wizard",157,0,0,0,"Expert Mage";

+	callfunc "F_ToHigh",Job_Mage_High,"High Mage",Job_High_Wizard,"Expert Mage";

 	if(BaseJob==Job_Novice && job_magician_q >= 1) goto L_BeMage;

 

 	mes "[Expert Mage]";

diff --git a/npc/jobs/1-1/merchant.txt b/npc/jobs/1-1/merchant.txt
index 1d155ef64..cec41e4f3 100644
--- a/npc/jobs/1-1/merchant.txt
+++ b/npc/jobs/1-1/merchant.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= kobra_k88

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

-//= 1.5

+//= 1.6

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

 //= eAthena 1.0 +

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

@@ -14,13 +14,14 @@
 //= v1.3 Added Baby Class support [Lupus]

 //= v1.4 Optimised and moved first checker to Jfunc1-1 [massdriller]

 //= 1.5 Changed Prontera->Izlude teleport price to 600 [Lupus]

+//= 1.6 Now saves/restores all quest skills [Lupus]

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

 

 

 // == Guild NPCs == 

 // -- Mahnsoo --

 alberta_in.gat,53,43,6	script	Chief Mahnsoo	86,{

-	callfunc "F_ToHigh",Job_Merchant_High,"Merchant High",Job_Whitesmith,"White Smith",153,154,155,0,"Chief Mahnsoo";

+	callfunc "F_ToHigh",Job_Merchant_High,"Merchant High",Job_Whitesmith,"Chief Mahnsoo";

 	mes "[Chief Mahnsoo]";

 	if(BaseJob==Job_Novice && job_merchant_q3 == 4) goto L_MakeMerc;

 	if(BaseJob==Job_Novice && job_merchant_q3 == 3) goto L_GiveRecpt;

diff --git a/npc/jobs/1-1/swordman.txt b/npc/jobs/1-1/swordman.txt
index 2e5c0c63c..76ec9d464 100644
--- a/npc/jobs/1-1/swordman.txt
+++ b/npc/jobs/1-1/swordman.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= kobra_k88

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

-//= 1.6

+//= 1.7

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

 //= eAthena 1.0 +

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

@@ -17,6 +17,7 @@
 //=     and are limited to 7min to complete the quest [Fredzilla]

 //= v1.5 Optimised and moved first checker to Jfunc1-1 [massdriller]

 //= 1.6 Fixed possible EXP abuse [Lupus]

+//= 1.7 Now saves/restores all quest skills [Lupus]

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

 

 

@@ -55,7 +56,7 @@ izlude_in.gat,62,170,0	script	w1039	45,1,1,{
 // == Npcs ==

 // -- Master Swordsman --

 izlude_in.gat,74,172,5	script	Master Swordsman	119,{

-	callfunc "F_ToHigh",Job_Swordman_High,"Swordman High",Job_Lord_Knight,"Lord Knight",144,145,146,0,"Master Swordsman";

+	callfunc "F_ToHigh",Job_Swordman_High,"Swordman High",Job_Lord_Knight,"Master Swordsman";

 	mes "[Master Swordsman]";

 	if(BaseJob==Job_Novice && job_sword_q == 2) goto L_Done;

 	mes "Welcome to the Swordsman Association! So.. What business brings you to us?";

diff --git a/npc/jobs/1-1/thief.txt b/npc/jobs/1-1/thief.txt
index 0d1361927..0359458ad 100644
--- a/npc/jobs/1-1/thief.txt
+++ b/npc/jobs/1-1/thief.txt
@@ -14,6 +14,7 @@
 //= 1.3 Added Baby Class support [Lupus]

 //= v1.4 Optimised and moved first checker to Jfunc1-1 [massdriller]

 //= Fixed possible EXP abuse [Lupus]

+//= 1.5 Now saves/restores all quest skills [Lupus]

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

 

 

@@ -208,7 +209,7 @@ M_Menu:
 

 // -- Test Grader --

 moc_prydb1.gat,42,133,2	script	Comrade Brad	118,{

-	callfunc "F_ToHigh",Job_Thief_High,"Thief High",Job_Assassin_Cross,"Assassin Cross",149,150,151,152,"Brad";

+	callfunc "F_ToHigh",Job_Thief_High,"Thief High",Job_Assassin_Cross,"Brad";

 	if(BaseJob == 0) goto L_Novice;

 	if(BaseJob == 6) goto L_Thief;