- Added some missing quests to quest_db.

- Fixed an issue on some 1-1 job quest log commands.
- Fixed some issues with hair_style. (bugreport:3558)

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

5 files changed, 45 insertions, 17 deletions

diff --git a/db/quest_db.txt b/db/quest_db.txt
index 23017b11a..240d6b561 100644
--- a/db/quest_db.txt
+++ b/db/quest_db.txt
@@ -19,6 +19,8 @@
 1012,0,0,0,0,0,0,0,"Job Change to Merchant"
 1013,0,0,0,0,0,0,0,"Job Change to Thief"
 1014,0,0,0,0,0,0,0,"Job Change to Swordman"
+1015,0,0,0,0,0,0,0,"Your first quest"
+1016,0,0,0,0,0,0,0,"Gaining base levels"
 2000,0,0,0,0,0,0,0,"Job Change to Blacksmith"
 2001,0,0,0,0,0,0,0,"Job Change to Blacksmith"
 2002,0,0,0,0,0,0,0,"Job Change to Blacksmith"
diff --git a/npc/jobs/1-1/acolyte.txt b/npc/jobs/1-1/acolyte.txt
index 77802fdaf..f62b8404e 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.1
+//= 2.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -27,6 +27,7 @@
 //= 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]
+//= 2.2 Fixed an issue with completequest by adding checkquest. [Kisuka]
 //============================================================ 
 
 prt_church,184,41,4	script	Cleric#aco	60,{
@@ -183,9 +184,15 @@ 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;
+		if(checkquest(1001) != "-1") {
+			completequest 1001;
+		}
+		else if(checkquest(1002) != "-1") {
+			completequest 1002;
+		}
+		else {
+			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/mage.txt b/npc/jobs/1-1/mage.txt
index ce5784770..c382358a2 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.8
+//= 1.9
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -21,6 +21,7 @@
 //=	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]
+//= 1.9 Fixed an issue with completequest by adding checkquest. [Kisuka]
 //============================================================ 
 
 geffen_in,164,124,4	script	Mage Guildsman	123,{
@@ -208,10 +209,18 @@ 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;
+		if(checkquest(1005) != "-1") {
+			completequest 1005;
+		}
+		else if(checkquest(1006) != "-1") {
+			completequest 1006;
+		}
+		else if(checkquest(1007) != "-1") {
+			completequest 1007;
+		}
+		else {
+			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~";
diff --git a/npc/jobs/1-1/merchant.txt b/npc/jobs/1-1/merchant.txt
index 06ac821cb..4d0e9fd11 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.2
+//= 2.3
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -27,6 +27,7 @@
 //= 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]
+//= 2.3 Fixed an issue with completequest by adding checkquest. [Kisuka]
 //============================================================ 
 
 alberta_in,53,43,6	script	Merchant#mer	86,{
@@ -152,10 +153,18 @@ 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;
+		if(checkquest(1009) != "-1") {
+			completequest 1009;
+		}
+		else if(checkquest(1010) != "-1") {
+			completequest 1010;
+		}
+		else if(checkquest(1011) != "-1") {
+			completequest 1011;
+		}
+		else {
+			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) {
diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt
index 94ffc2a8b..9a62b3d74 100644
--- a/npc/merchants/hair_style.txt
+++ b/npc/merchants/hair_style.txt
@@ -231,7 +231,7 @@ alberta_in,55,142,7	script	Hair Dresser	91,{
 					mes "care how I look at all.'";
 					close2; cutin "",255; end;
 				}
-					mes "Oh, that's 'Intimidate' style!"";
+					mes "Oh, that's 'Intimidate' style!";
 					mes "The Rogue women seem to like";
 					mes "this style...although I imagine";
 					mes "that more of them would prefer";
@@ -353,6 +353,7 @@ alberta_in,55,142,7	script	Hair Dresser	91,{
 					mes "casting those windy spells.";
 					close2; cutin "",255; end;
 			}
+		}
 	case 2:
 		if(BaseLevel < 60) {
 			mes "[Veronica]";
@@ -410,7 +411,7 @@ alberta_in,55,142,7	script	Hair Dresser	91,{
 		}
 			callsub L_cutin,.@style;
 			mes "[Veronica]";
-			mes "You have chosen style no. (" + input + ").";
+			mes "You have chosen style no. (" + .@style + ").";
 			mes "I shall proceed with your request.";
 			mes "Would you mind?";
 			next;
@@ -484,7 +485,7 @@ alberta_in,55,142,7	script	Hair Dresser	91,{
 				mes "[Veronica]";
 				mes "Alright, it's done~";
 				mes "I hope you like";
-				mes "this style no.(" + input + ").";
+				mes "this style no.(" + .@style + ").";
 				mes "Feel free to come back anytime";
 				mes "when you want a new hairstyle. Hohohohohoho~";
 				setlook 1,.@style;