Updated Tutorial quests, and added back NPCs needed for Priest quest.

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

1 files changed, 225 insertions, 2 deletions

diff --git a/npc/jobs/1-1/acolyte.txt b/npc/jobs/1-1/acolyte.txt
index d2a436e13..611d99242 100644
--- a/npc/jobs/1-1/acolyte.txt
+++ b/npc/jobs/1-1/acolyte.txt
@@ -3,13 +3,14 @@
 //===== By: ================================================== 
 //= Kisuka
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
 //= Job Change to Acolyte Class
 //===== Additional Comments: ================================= 
 //= 1.0 First Version. [Kisuka]
+//= 1.1 Added back the npcs used for the priest quest.
 //============================================================ 
 prt_church,184,41,4	script	Cleric#aco	60,{
 	if (Upper == 1) {
@@ -108,4 +109,226 @@ prt_church,184,41,4	script	Cleric#aco	60,{
 	case 3:
 		close;
 	}
-}
\ No newline at end of file
+}
+
+prt_fild03,365,255,2	script	Ascetic#aco	89,{
+	mes "[Father Rubalkabara]";
+	if (BaseJob == Job_Novice) {
+		if (job_acolyte_q == 6) {
+			mes "Please take care. They should know that you've met me by the time you arrive at the Prontera Sanctuary.";
+			next;
+			mes "[Father Rubalkabara]";
+			mes "I've sent a carrier pigeon with a message. I hope it will arrive there safely...";
+			close;
+		}
+		if (job_acolyte_q != 0) {
+			if (job_acolyte_q == 2) {
+				mes "Oh...? You must be the one who aspires to become an Acolyte. I've already received news from the Sanctuary that you might be coming.";
+				next;
+				mes "[Father Rubalkabara]";
+				mes "Now, your name was " + strcharinfo(0) + ", right? Excellent, thank you for visiting me.";
+				next;
+				mes "[Father Rubalkabara]";
+				mes "I believe you've been told much about Acolytes from Friar Mareusis. Plus, there's plenty of helpful people in the Prontera Sanctuary.";
+				next;
+				mes "[Father Rubalkabara]";
+				mes "I guess there's really no need for me to teach you much. Besides, I'm sure your someone from your generation may have trouble listening to an old man like me. Hahaha~";
+				next;
+				mes "[Father Rubalkabara]";
+				mes "Still, lessons may come from the places you'd least expect. God loves to teach his children in strange ways. You'll see.";
+				next;
+				mes "[Father Rubalkabara]";
+				mes "Well, I'll send the message telling them that you've come to visit me. So, you may now return to the Prontera Sanctuary.";
+				next;
+				mes "[Father Rubalkabara]";
+				mes "Farewell.";
+				close2;
+				savepoint "prt_fild03",361,255;
+				set job_acolyte_q,6;
+				end;
+			}
+			else {
+				mes "Oh...";
+				mes "Are you one of the";
+				mes "Acolyte applicants...?";
+				mes "Let's see...";
+				next;
+				mes "[Father Rubalkabara]";
+				mes "Your name is " + strcharinfo(0) + "?";
+				mes "I don't think your name";
+				mes "is on my list. Hmmm...";
+				next;
+				mes "[Father Rubalkabara]";
+				mes "Why don't you go back to the Prontera Sanctuary and check again?";
+				close;
+			}
+		}
+		else {
+			mes "Huh? What brings you here? This is a very dangerous place for a Novice like yourself!";
+			close;
+		}
+	}
+	else if (BaseJob == Job_Acolyte) callfunc "F_FatherRub";
+	else {
+		if (BaseJob == Job_Priest) {
+			mes "Greetings.";
+			next;
+			mes "[Father Rubalkabara]";
+			mes "Welcome to the Deep. Feel free to sit and contemplate God's message with me. This place is beautiful, even if danger accompanies its sense of serenity...";
+			close;
+		}
+		else {
+			mes "Oh ho...";
+			mes "Have you come into the Deep here for training? Or are you just a Wanderer?";
+			next;
+			mes "[Father Rubalkabara]";
+			mes "Whoever you are, please take care of yourself. The monsters in here are shockingly strong, contrary to their cute appearance.";
+			close;
+		}
+	}
+}
+
+moc_fild07,41,355,4	script	Ascetic#2aco	95,{
+	mes "[Mother Mathilda]";
+	if (BaseJob == Job_Novice) {
+		if (job_acolyte_q == 7) {
+			mes "I will send a carrier pigeon to the Prontera Sanctuary. When you return, the Priest there should already have received my message.";
+			next;
+			mes "[Mother Mathilda]";
+			mes "I will pray to God, and hope that you become an Acolyte soon.";
+			close;
+		}
+		if (job_acolyte_q != 0) {
+			if (job_acolyte_q == 3) {
+				mes "Ah, you must be one of the Acolyte applicants. I sincerely welcome you.";
+				next;
+				mes "[Mother Mathilda]";
+				mes "What is your name? " + strcharinfo(0) + "? Let's see... Ah, you're on my list.";
+				next;
+				mes "[Mother Mathilda]";
+				mes "I will send a message to the Sanctuary confirming that you, " + strcharinfo(0) + " visited me and completed your penance.";
+				next;
+				mes "[Mother Mathilda]";
+				mes "Please return to the Prontera Sanctuary and speak to the Priest in charge.";
+				close2;
+				savepoint "moc_fild07",35,355;
+				set job_acolyte_q,7;
+				end;
+			}
+			else {
+				mes "Ah...!";
+				mes "You must be one";
+				mes "of the Acolyte applicants.";
+				mes "I sincerely welcome you.";
+				next;
+				mes "[Mother Mathilda]";
+				mes "Now, what is your name?";
+				mes "" + strcharinfo(0) + "? Let's see...";
+				next;
+				mes "[Mother Mathilda]";
+				mes "Hmm...";
+				mes "It seems your name";
+				mes "is not on my list...";
+				next;
+				mes "[Mother Mathilda]";
+				mes "Perhaps you should return to the Prontera Sanctuary and check the destination for your penance trial once again.";
+				close;
+			}
+		}
+		else {
+			mes "...";
+			close;
+		}
+	}
+	else if (BaseJob == Job_Acolyte) callfunc "F_MotherMart";
+	else {
+		if (BaseJob == Job_Priest) {
+			mes "Hello there~";
+			next;
+			mes "[Mother Mathilda]";
+			mes "How is your practice coming along? I certainly hope you're enjoying living in the grace of God.";
+			close;
+		}
+		else {
+			mes "May God";
+			mes "be with you...";
+			close;
+		}
+	}
+}
+
+prt_fild00,208,218,6	script	Ascetic#3aco	98,{
+	mes "[Father Yosuke]";
+	if (BaseJob == Job_Novice) {
+		if (job_acolyte_q == 8) {
+			mes "What?";
+			next;
+			mes "[Father Yosuke]";
+			mes "Have you any more business with me?! You don't! Go back to the Sanctuary now!";
+			close;
+		}
+		if (job_acolyte_q != 0) {
+			if (job_acolyte_q == 4) {
+				mes "Hey.";
+				mes "Whatever you are,";
+				mes "you look like an";
+				mes "Acolyte applicant.";
+				mes "Right?";
+				next;
+				mes "[Father Yosuke]";
+				mes "Not bad, not bad. You withstood the penance trial pretty well.";
+				mes "So what's your name?";
+				next;
+				mes "[Father Yosuke]";
+				mes "" + strcharinfo(0) + ", huh?";
+				next;
+				mes "[Father Yosuke]";
+				mes "Okay. I'll send a message to the Sanctuary that you, " + strcharinfo(0) + ", came to visit me.";
+				next;
+				mes "[Father Yosuke]";
+				mes "Now go back to the Santuary and finish becoming an Acolyte, kid.";
+				close2;
+				savepoint "prt_fild00",206,230;
+				set job_acolyte_q,8;
+				end;
+			}
+			else {
+				mes "Hey.";
+				mes "You look like an Acolyte Applicant. Am I right?";
+				next;
+				mes "[Father Yosuke]";
+				mes "Not bad at all, you've made it all the way here from Prontera. So what's your name, kid?";
+				next;
+				mes "[Father Yosuke]";
+				mes "" + strcharinfo(0) + ", huh? Why isn't your name on my list?";
+				next;
+				mes "[Father Yosuke]";
+				mes "You probably made a mistake. Go back to the Santuary, and check with the Bishop.";
+				close;
+			}
+		}
+		else {
+			mes "You...";
+			mes "Novice.";
+			mes "There something";
+			mes "you wanna tell me?";
+			close;
+		}
+	}
+	else if (BaseJob == Job_Acolyte) callfunc "F_FatherYos";
+	else {
+		if (BaseJob == Job_Priest) {
+			mes "Hey...";
+			next;
+			mes "[Father Yosuke]";
+			mes "If you like, come sit here with me and meditate the great truths. God's majesty is truly inspiring...";
+			close;
+		}
+		else {
+			mes "Do you have anything to say? Because unfortunately for you,";
+			mes "I don't any replies.";
+			close;
+		}
+	}
+}
+