summaryrefslogtreecommitdiff
path: root/npc/jobs/1-1/acolyte.txt
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-08-10 00:03:11 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-08-10 00:03:11 +0000
commit76192f96dda6a98ce9c05027230dea33990dc392 (patch)
tree9a268c925bcb7411ca55ca6497b30127fd71e0bb /npc/jobs/1-1/acolyte.txt
parentf26f8abb565667013271ba19960d68b374ec910d (diff)
downloadhercules-76192f96dda6a98ce9c05027230dea33990dc392.tar.gz
hercules-76192f96dda6a98ce9c05027230dea33990dc392.tar.bz2
hercules-76192f96dda6a98ce9c05027230dea33990dc392.tar.xz
hercules-76192f96dda6a98ce9c05027230dea33990dc392.zip
* 2-1 Job quest update. Needs in-depth testing.
- Because of a change of variables, players currently undergoing the job change quests may find themselves in a slightly different position in the quest. - This update reverts the hunter job quest timer BACK to 3 minutes. * Corrected some Acolyte job quest issues. - Removed Priest quest specific text from acolyte quest file. * Bard Pang Voice quest was checking for the wrong variable. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10973 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/jobs/1-1/acolyte.txt')
-rw-r--r--npc/jobs/1-1/acolyte.txt164
1 files changed, 6 insertions, 158 deletions
diff --git a/npc/jobs/1-1/acolyte.txt b/npc/jobs/1-1/acolyte.txt
index aa725c94d..6f6ac5c9f 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: =====================================
-//= 1.7
+//= 1.7a
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -21,6 +21,7 @@
//= 1.7 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
//= No longer uses function "F_ToHigh"
//= Proper dialog for Priest job quest is unused (for now.)
+//= 1.7a Functions now make use of proper priest quest dialog [L0ne_W0lf]
//============================================================
prt_church,184,41,4 script Cleric#aco 60,{
@@ -260,7 +261,7 @@ prt_fild03,365,255,2 script Ascetic#aco 89,{
next;
mes "[Father Rubalkabara]";
mes "Farewell.";
- close;
+ close2;
savepoint "prt_fild03",361,255;
set job_acolyte_q,6;
end;
@@ -286,41 +287,7 @@ prt_fild03,365,255,2 script Ascetic#aco 89,{
close;
}
}
- else if (BaseJob == Job_Acolyte) {
- callfunc "F_FatherRub";
- end;
- //Official Dialog is as follows, however it requires rewriting the priest quest.
- if (job_priest_q != 0) {
- if (job_priest_q == 1) {
- mes "Ah yes, so you're the young Acolyte who wishes to become a Priest.";
- next;
- mes "[Father Rubalkabara]";
- mes "I've received the message from Bishop Paul. Since you made the pilgrimage, I hope you accomplish your goal of becoming a Priest.";
- next;
- mes "[Father Rubalkabara]";
- mes "Also, if you have a chance, please visit this abbey again. It's a sacred place for our Church.";
- next;
- mes "[Father Rubalkabara]";
- mes "Well then, please head to your next destination for your pilgrimage. Be safe in your travels.";
- close2;
- savepoint "prt_fild03",361,255;
- set job_priest_q,2;
- end;
- }
- else if (job_priest_q == 2) {
- mes "Please be hurry to the next destination for your pilgrimage. I hope you become a Priest soon.";
- close;
- }
- else {
- mes "May I ask why you have returned? Please go back and continue your religious practice.";
- close;
- }
- }
- else {
- mes "I have no idea what brought you here, but please excuse me.";
- close;
- }
- }
+ else if (BaseJob == Job_Acolyte) callfunc "F_FatherRub";
else {
if (BaseJob == Job_Priest) {
mes "Greetings.";
@@ -392,62 +359,7 @@ moc_fild07,41,355,4 script Ascetic#2aco 95,{
close;
}
}
- else if (BaseJob == Job_Acolyte) {
- callfunc "F_MotherMart";
- end;
- //Official Dialog is as follows, however it requires rewriting the priest quest.
- if (job_priest_q != 0) {
- if (job_priest_q == 1) {
- mes "Hmm...";
- mes "It seems you're";
- mes "training to become";
- mes "a Priest.";
- next;
- mes "[Mother Marthilda]";
- mes "However, at this point in your pilgrimage, I am not the person that you should be visiting.";
- next;
- mes "[Mother Marthilda]";
- mes "Perhaps you should ask Bishop Paul or Sister Cecilia once again. Well, may God be with you...";
- close;
- }
- else if (job_priest_q == 2) {
- mes "Ah, are you";
- mes "a Priest trainee...?";
- mes "Welcome!";
- next;
- mes "[Mother Marthilda]";
- mes "We Priests are obliged to spread the message of God to";
- mes "the peoples of the Earth.";
- next;
- mes "[Mother Marthilda]";
- mes "After you become a Priest, your travels may take you to the Morroc Pyramids. I hope that you may release the Undead there from the evil to which they are bound.";
- next;
- mes "[Mother Marthilda]";
- mes "Well then...";
- mes "I shall pray to";
- mes "God for safety";
- mes "on your journey.";
- close;
- savepoint "moc_fild07",35,355;
- set job_priest_q,3;
- end;
- }
- else if (job_priest_q == 3) {
- mes "Please leave soon, and";
- mes "continue your training.";
- close;
- }
- else {
- mes "May I ask you the reason you came back? Please continue your training.";
- close;
- }
- }
- else {
- mes "May God";
- mes "be with you...";
- close;
- }
- }
+ else if (BaseJob == Job_Acolyte) callfunc "F_MotherMart";
else {
if (BaseJob == Job_Priest) {
mes "Hello there~";
@@ -522,71 +434,7 @@ prt_fild00,208,218,6 script Ascetic#3aco 98,{
close;
}
}
- else if (BaseJob == Job_Acolyte) {
- callfunc "F_FatherYos";
- end;
- //Official Dialog is as follows, however it requires rewriting the priest quest.
- if (job_priest_q != 0) {
- if (job_priest_q == 1) {
- mes "Hmm...";
- mes "A Priest trainee, eh?";
- next;
- mes "[Father Yosuke]";
- mes "Well, you got the wrong person. If you're supposed to meet up with me at all, it'd be later.";
- next;
- mes "[Father Yosuke]";
- mes "But that's your own fault.";
- mes "Now, go back to Church, kid.";
- close;
- }
- else if (job_priest_q == 2) {
- mes "Hmm...";
- mes "A Priest trainee, eh?";
- next;
- mes "[Father Yosuke]";
- mes "Well, you got the wrong person. If you're supposed to meet up with me at all, it'd be later.";
- next;
- mes "[Father Yosuke]";
- mes "But that's your own fault. Go back to Church.";
- close;
- }
- else if (job_priest_q == 3) {
- mes "Hmm.";
- mes "A Priest";
- mes "trainee, eh? ";
- mes "Welcome.";
- next;
- mes "[Father Yosuke]";
- mes "I won't say";
- mes "anything more.";
- mes "Just devote your";
- mes "life to God.";
- next;
- mes "[Father Yosuke]";
- mes "Now go back to church.";
- mes "Hereby, the first of";
- mes "your trials is now";
- mes "completed.";
- close2;
- savepoint "prt_fild00",206,230;
- set job_priest_q,4;
- end;
- }
- else if (job_priest_q == 4) {
- mes "I told you to go back to church.";
- mes "Or do you want to live with me here for the rest of your life...?";
- close;
- }
- else {
- mes "Just go be a Priest. This isn't a playground for kids.";
- close;
- }
- }
- else {
- mes "...Acolyte, you don't have any business with me here.";
- close;
- }
- }
+ else if (BaseJob == Job_Acolyte) callfunc "F_FatherYos";
else {
if (BaseJob == Job_Priest) {
mes "Hey...";