Added Quest Log commands for 1-1 job quests and trans quest.

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

8 files changed, 50 insertions, 8 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 00ff1763f..628ce49d8 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,7 @@
 Date		Added
 ======
+2009/07/26
+	* Rev. 13969 Added Quest Log commands for 1-1 job quests and trans quest. [L0ne_W0lf]
 2009/07/18
 	* Fixed "OnMobDeath" doesn't work sometime in Izlude Party Arena. [Inkfish]
 2009/07/07
diff --git a/npc/jobs/1-1/acolyte.txt b/npc/jobs/1-1/acolyte.txt
index b8f369261..77802fdaf 100644
--- a/npc/jobs/1-1/acolyte.txt
+++ b/npc/jobs/1-1/acolyte.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 2.0
+//= 2.1
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -26,6 +26,7 @@
 //= 1.8a More bug fixes care of Crashy. [L0ne_W0lf]
 //= 1.9 Changed Marthilda to Mathilda. [L0ne_W0llf]
 //= 2.0 Fixed High Acolytesnot being given holy light. [L0ne_W0lf]
+//= 2.1 Added Quest Log commands. [L0ne_W0lf]
 //============================================================ 
 
 prt_church,184,41,4	script	Cleric#aco	60,{
@@ -106,14 +107,17 @@ prt_church,184,41,4	script	Cleric#aco	60,{
 				default:
 					set job_acolyte_q,2;
 					mes "Please visit ^000077Father Rubalkabara^000000, a member of the Prontera Parish, and return here. He has been practicing asceticism in the ^000077Relics NorthEast of Prontera City^000000.";
+					setquest 1001;
 					break;
 				case 1:
 					set job_acolyte_q,3;
 					mes "Please visit ^000077Mother Mathilda^000000 and then return to me. She has been practicing asceticism near ^000077Morroc Town, SouthWest of Prontera City^000000.";
+					setquest 1002;
 					break;
 				case 2:
 					set job_acolyte_q,4;
 					mes "Please visit ^000077Father Yosuke^000000 and return here. He has been practicing asceticism around ^000077a bridge somewhere NorthWest of Prontera^000000.";
+					setquest 1003;
 					break;
 				}
 				next;
@@ -179,6 +183,9 @@ prt_church,184,41,4	script	Cleric#aco	60,{
 		skill 143,0,0;
 		callfunc "Job_Change",Job_Acolyte;
 		callfunc "F_ClearJobVar";
+		completequest 1001;
+		completequest 1002;
+		completequest 1003;
 		mes "[Father Mareusis]";
 		mes "Always remember to be thankful to God, who is taking care of us all the time.";
 		next;
diff --git a/npc/jobs/1-1/archer.txt b/npc/jobs/1-1/archer.txt
index 1d9fb697b..e42860334 100644
--- a/npc/jobs/1-1/archer.txt
+++ b/npc/jobs/1-1/archer.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.8
+//= 1.9
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -21,6 +21,7 @@
 //=	No longer uses function "F_ToHigh"
 //= 1.7a Fixed minor dialogue bug at Grade==25 [Lupus]
 //= 1.8 Fixed mistake in condition check. [L0ne_W0lf]
+//= 1.9 Added Quest Log commands. [L0ne_W0lf]
 //============================================================ 
 
 payon_in02,64,71,4	script	Archer Guildsman#archer	85,{
@@ -97,6 +98,7 @@ payon_in02,64,71,4	script	Archer Guildsman#archer	85,{
 			next;
 			if (select("Apply.:Cancel") == 1) {
 				set job_archer_q,1;
+				setquest 1004;
 				mes "[Archer Guildsman]";
 				mes "Okay, sign here. Alright, um, I'll promote you once you meet the requirements.";
 				next;
@@ -191,6 +193,7 @@ payon_in02,64,71,4	script	Archer Guildsman#archer	85,{
 		next;
 		callfunc "Job_Change",Job_Archer;
 		callfunc "F_ClearJobVar";
+		completequest 1004;
 		mes "[Archer Guildsman]";
 		mes "Congratulations!";
 		mes "You are now an Archer!";
diff --git a/npc/jobs/1-1/mage.txt b/npc/jobs/1-1/mage.txt
index e3159cb4f..ce5784770 100644
--- a/npc/jobs/1-1/mage.txt
+++ b/npc/jobs/1-1/mage.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.7a
+//= 1.8
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -20,6 +20,7 @@
 //= 1.7 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //=	No longer uses function "F_ToHigh"
 //= 1.7a Fixed a "If" in the quest. (bugreport:489) [Samuray22]
+//= 1.8 Added Quest Log commands. [L0ne_W0lf]
 //============================================================ 
 
 geffen_in,164,124,4	script	Mage Guildsman	123,{
@@ -207,6 +208,10 @@ geffen_in,164,124,4	script	Mage Guildsman	123,{
 		callfunc "Job_Change",Job_Mage;
 		callfunc "F_ClearJobVar";
 		set Zeny,Zeny+50;
+		completequest 1005;
+		completequest 1006;
+		completequest 1007;
+		completequest 1008;
 		mes "[Mage Guildsman]";
 		mes "'Welcome to My World~'";
 		mes "Heh heh, I just wanted to say that. You know, it's a quote from a well-known movie~";
@@ -233,21 +238,25 @@ geffen_in,164,124,4	script	Mage Guildsman	123,{
 				mes "make me a";
 				mes "^3355FFMixed Solution No. 1^000000";
 				mes "and bring it back to me.";
+				setquest 1005;
 				break;
 			case 2:
 				mes "make me a";
 				mes "^3355FFMixed Solution No. 2^000000";
 				mes "and bring it back to me.";
+				setquest 1006;
 				break;
 			case 3:
 				mes "make me a";
 				mes "^3355FFMixed Solution No. 3^000000";
 				mes "and bring it back to me.";
+				setquest 1007;
 				break;
 			default:
 				mes "make me a";
 				mes "^3355FFMixed Solution No. 4^000000";
 				mes "and bring it back to me.";
+				setquest 1008;
 			}
 			next;
 			mes "[Mage Guildsman]";
diff --git a/npc/jobs/1-1/merchant.txt b/npc/jobs/1-1/merchant.txt
index 232b98f17..06ac821cb 100644
--- a/npc/jobs/1-1/merchant.txt
+++ b/npc/jobs/1-1/merchant.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 2.1
+//= 2.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -26,6 +26,7 @@
 //= 1.9b Typo. "nextl" -> "next;" (Barron-Monster) [L0ne_W0lf]
 //= 2.0 Should "fix" the problem with the Biliban Kafra. [L0ne_W0lf]
 //= 2.1 Fixed mistake in condition check. [L0ne_W0lf]
+//= 2.2 Added Quest Log commands. [L0ne_W0lf]
 //============================================================ 
 
 alberta_in,53,43,6	script	Merchant#mer	86,{
@@ -151,6 +152,10 @@ alberta_in,53,43,6	script	Merchant#mer	86,{
 		mes "Congratulations!";
 		callfunc "Job_Change",Job_Merchant;
 		callfunc "F_ClearJobVar";
+		completequest 1009;
+		completequest 1010;
+		completequest 1011;
+		completequest 1012;
 		mes "I'm very pleased that you are joining the Merchant Guild and hope that you will play an active part in Rune-Midgarts' economy.";
 		next;
 		if (quest_alb_01 == 1) {
@@ -184,10 +189,12 @@ alberta_in,53,43,6	script	Merchant#mer	86,{
 			if (job_merchant_q2 == 1) {
 				mes "[Chief Mahnsoo]";
 				mes "Remember, the Serial Number of the package is ^3355FF2485741^000000.";
+				setquest 1009;
 			}
 			else {
 				mes "[Chief Mahnsoo]";
 				mes "Remember, the Serial Number of the package is ^3355FF2328137^000000.";
+				setquest 1009;
 			}
 		}
 		else if (job_merchant_q2 == 3 || job_merchant_q2 == 4) {
@@ -196,10 +203,12 @@ alberta_in,53,43,6	script	Merchant#mer	86,{
 			if (job_merchant_q2 == 3) {
 				mes "[Chief Mahnsoo]";
 				mes "When you get there, give the package to the Mage Guildsman in charge. Remember, the packages Serial Number is ^3355FF2989396^000000.";
+				setquest 1010;
 			}
 			else {
 				mes "[Chief Mahnsoo]";
 				mes "When you get there, give the package to the Mage Guildsman in charge. Remember, the packages Serial Number is ^3355FF2191737^000000.";
+				setquest 1010;
 			}
 		}
 		else if (job_merchant_q2 == 5 || job_merchant_q2 == 6) {
@@ -211,10 +220,12 @@ alberta_in,53,43,6	script	Merchant#mer	86,{
 			if (job_merchant_q2 == 5) {
 				mes "[Chief Mahnsoo]";
 				mes "But he's a little forgetful, so give it to one of his students. Remember, the package's Serial Number is ^3355FF3012685^000000.";
+				setquest 1011;
 			}
 			else {
 				mes "[Chief Mahnsoo]";
 				mes "But he's a little forgetful, give it to one of his students. Remember, the package's Serial Number is ^3355FF3487372^000000.";
+				setquest 1011;
 			}
 		}
 		else if (job_merchant_q2 == 7 || job_merchant_q2 == 8) {
@@ -223,10 +234,12 @@ alberta_in,53,43,6	script	Merchant#mer	86,{
 			if (job_merchant_q2 == 7) {
 				mes "[Chief Mahnsoo]";
 				mes "Remember, the package's Serial Number is ^3355FF3318702^000000.";
+				setquest 1012;
 			}
 			else {
 				mes "[Chief Mahnsoo]";
 				mes "Remember, the package's Serial Number is ^3355FF3543625^000000.";
+				setquest 1012;
 			}
 		}
 		if (job_merchant_q2 == 7 || job_merchant_q2 == 8) {
diff --git a/npc/jobs/1-1/swordman.txt b/npc/jobs/1-1/swordman.txt
index 6a913e4fb..dce01d9b6 100644
--- a/npc/jobs/1-1/swordman.txt
+++ b/npc/jobs/1-1/swordman.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 2.2
+//= 2.3
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -35,6 +35,7 @@
 //= 2.0 Corrected NPC names to fall within proper resctrictions. [L0ne_W0lf]
 //= 2.1 Fixed mistake in condition check. [L0ne_W0lf]
 //= 2.2 Warp portals dont end with ; [Yommy]
+//= 2.3 Added Quest Log commands. [L0ne_W0lf]
 //============================================================ 
 
 izlude_in,74,172,4	script	Swordman#swd_1	119,{
@@ -112,6 +113,7 @@ izlude_in,74,172,4	script	Swordman#swd_1	119,{
 			if (select("Sign up.:Cancel.") == 1) {
 				savepoint "izlude_in",65,165;
 				set job_sword_q,1;
+				setquest 1014;
 				mes "[Swordman]";
 				mes "Ah, yes. Your application will be reviewed as soon as possible.";
 				next;
@@ -156,6 +158,7 @@ izlude_in,74,172,4	script	Swordman#swd_1	119,{
 			next;
 			callfunc "Job_Change",Job_Swordman;
 			set job_sword_q,0;
+			completequest 1014;
 			mes "[Swordman]";
 			mes "Once again, congratulations. I expect that you will be a good representative of the Swordman Association.";
 			close;
diff --git a/npc/jobs/1-1/thief.txt b/npc/jobs/1-1/thief.txt
index c7d3edb5b..6ac5b9911 100644
--- a/npc/jobs/1-1/thief.txt
+++ b/npc/jobs/1-1/thief.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= eAthena dev team
 //===== Current Version: =====================================
-//= 1.7
+//= 1.8
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -19,6 +19,7 @@
 //= 1.6 Merged back JFunc [Lupus] 1.6a typos
 //= 1.7 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //=	No longer uses function "F_ToHigh"
+//= 1.8 Added Quest Log commands. [L0ne_W0lf]
 //============================================================
 
 moc_prydb1,39,129,2	script	Thief Guide	69,{
@@ -298,6 +299,7 @@ moc_prydb1,39,129,2	script	Thief Guide	69,{
 		mes "[Thief Guide]";
 		mes "Because I feel like it, I now decree that you have passed this interview. Good work!";
 		set job_thief_q,2;
+		setquest 1013;
 		next;
 		mes "[Thief Guide]";
 		mes "Now, your actual abilities will need to be tested. Do you know anything about the test?";
@@ -430,6 +432,7 @@ moc_prydb1,42,133,2	script	Comrade	118,{
 		if (countitem(1070) != 0) delitem 1070,countitem(1070); //Mushroom_Of_Thief_2
 		callfunc "Job_Change",Job_Thief;
 		callfunc "F_ClearJobVar";
+		completequest 1013;
 		next;
 		mes "[Comrade]";
 		mes "Congratulations on becoming a Thief! From now, be an honorable representative of the Thief's Guild.";
diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt
index 592dfd186..53bf49913 100644
--- a/npc/jobs/valkyrie.txt
+++ b/npc/jobs/valkyrie.txt
@@ -5,7 +5,7 @@
 //= finished, optimized and tested by Lupus
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 2.9b
+//= 3.0
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -36,6 +36,7 @@
 //= 2.8 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 2.9 Corrected Valkyrie case spicifying where to warp after rebirthing. [L0ne_W0lf]
 //= 2.9b Fixed Verdandi typo, fixed resetting vars [Lupus]
+//= 3.0 Added quest log commands. [L0ne_W0lf]
 //============================================================ 
 
 valkyrie,48,86,4	script	Valkyrie#	811,{
@@ -138,7 +139,6 @@ valkyrie,48,86,4	script	Valkyrie#	811,{
 			mes "[Valkyrie]";
 			mes "One...";
 			mes "Two......";
-			//callfunc("F_SaveQuestSkills"); //now not used
 			next;
 			mes "[Valkyrie]";
 			mes "One...";
@@ -152,6 +152,7 @@ valkyrie,48,86,4	script	Valkyrie#	811,{
 			set MISC_QUEST,MISC_QUEST | 1024; //<-reset Skill Reset Event
 			skill 142,1,0;
 			skill 143,1,0;
+			completequest 1000;
 			next;
 			mes "[Valkyrie]";
 			mes "Congratulations.";
@@ -231,6 +232,7 @@ yuno_in02,88,164,5	script	Metheus Sylphe#Library	742,{
 				if (Zeny >= 1285000) {
 					set zeny,zeny-1285000;
 					set valkyrie_Q,1;
+					setquest 1000;
 					mes "[Metheus Sylphe]";
 					mes "Thank you, your donation will be used for a good cause. You may";
 					mes "now go in and read the book.";