summaryrefslogtreecommitdiff
path: root/npc/jobs/2-2
diff options
context:
space:
mode:
authorKisuka <Kisuka@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-09-11 04:52:10 +0000
committerKisuka <Kisuka@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-09-11 04:52:10 +0000
commita55285b3c3ff19cbd2b933e60a6e2b4440937236 (patch)
tree8a008f5e6861353898f391f8925c80fc432af89e /npc/jobs/2-2
parentcb109f91b0b953413b9245a1bee305cf0ada841f (diff)
downloadhercules-a55285b3c3ff19cbd2b933e60a6e2b4440937236.tar.gz
hercules-a55285b3c3ff19cbd2b933e60a6e2b4440937236.tar.bz2
hercules-a55285b3c3ff19cbd2b933e60a6e2b4440937236.tar.xz
hercules-a55285b3c3ff19cbd2b933e60a6e2b4440937236.zip
- Added quest log commands to all job quests.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14054 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/jobs/2-2')
-rw-r--r--npc/jobs/2-2/alchemist.txt35
-rw-r--r--npc/jobs/2-2/bard.txt12
-rw-r--r--npc/jobs/2-2/crusader.txt33
-rw-r--r--npc/jobs/2-2/dancer.txt19
-rw-r--r--npc/jobs/2-2/monk.txt39
-rw-r--r--npc/jobs/2-2/rogue.txt48
-rw-r--r--npc/jobs/2-2/sage.txt88
7 files changed, 259 insertions, 15 deletions
diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt
index 4d08431be..fe8141a94 100644
--- a/npc/jobs/2-2/alchemist.txt
+++ b/npc/jobs/2-2/alchemist.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= nestor_zulueta (Fusion), converted by Darkchild
//===== Current Version: =====================================
-//= 2.8
+//= 2.9
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -15,6 +15,7 @@
//= 2.6 Corrected a bug in advanced class checking. [L0ne_W0lf]
//= 2.7 Added missing checkweights. [L0ne_W0lf]
//= 2.8 Fixed minor typo in test section. [L0ne_W0lf]
+//= 2.9 Added Quest Log commands. [Kisuka]
//============================================================
alde_alche,27,185,5 script Alchemist Guildsman#am 744,{
@@ -183,14 +184,17 @@ alde_alche,27,185,5 script Alchemist Guildsman#am 744,{
switch(rand(1,3)) {
case 1:
set ALCH_Q,1;
+ setquest 2028;
mes "^551A8B7 Berserk Potions^000000.";
break;
case 2:
set ALCH_Q,2;
+ setquest 2029;
mes "^551A8B100 Mini Furnaces^000000.";
break;
case 3:
set ALCH_Q,3;
+ setquest 2030;
mes "^551A8B7,500 Fire Arrows^000000.";
}
next;
@@ -230,6 +234,15 @@ alde_alche,27,185,5 script Alchemist Guildsman#am 744,{
mes "Okay, now you need to learn";
mes "the basics to being an Alchemist and learn the procedures for mixing chemicals and medicines.";
set ALCH_Q,4;
+ if(checkquest(2028) != -1) {
+ changequest 2028,2031;
+ }
+ else if(checkquest(2029) != -1) {
+ changequest 2029,2031;
+ }
+ else {
+ changequest 2030,2031;
+ }
next;
mes "[Parmy Gianino]";
mes "But before all of that, you need to speak to Raspuchin. I'm not really sure what you'll be talking about with him...";
@@ -254,6 +267,15 @@ alde_alche,27,185,5 script Alchemist Guildsman#am 744,{
mes "Okay, now you need to learn";
mes "the basics to being an Alchemist and learn the procedures for mixing chemicals and medicines.";
set ALCH_Q,4;
+ if(checkquest(2028) != -1) {
+ changequest 2028,2031;
+ }
+ else if(checkquest(2029) != -1) {
+ changequest 2029,2031;
+ }
+ else {
+ changequest 2030,2031;
+ }
next;
mes "[Parmy Gianino]";
mes "But before all of that, you need to speak to Raspuchin. I'm not really sure what you'll be talking about with him...";
@@ -724,6 +746,7 @@ L_AskQuestions:
mes "He'll teach you how to do the experiments. Just tell him that";
mes "I sent you.";
set ALCH_Q,6;
+ changequest 2031,2032;
close;
}
else if (ALCH_Q == 5) {
@@ -889,6 +912,7 @@ alde_alche,13,15,7 script Studying Man#am 750,{
mes "^551A8B1 Yellow Herb^000000 and";
mes "^551A8B1 White Herb^000000.";
set ALCH_Q,7;
+ changequest 2032,2033;
next;
mes "[Darwin]";
mes "Once you have";
@@ -1229,6 +1253,7 @@ alde_alche,13,15,7 script Studying Man#am 750,{
mes "Good job.";
mes "It came out pretty well considering it's your first time. Go ahead and keep the medicines that you've just made.";
set ALCH_Q,8;
+ changequest 2033,2035;
next;
mes "[Darwin]";
mes "Now, go into the next room";
@@ -1405,6 +1430,7 @@ alde_alche,79,19,5 script Experiment Expert#am 748,{
next;
mes "[Van Helmont]";
set ALCH_Q,9;
+ changequest 2035,2036;
mes "Well then, see you later.";
mes "You'd better get going as";
mes "soon as you can.";
@@ -1499,6 +1525,7 @@ alde_alche,79,19,5 script Experiment Expert#am 748,{
mes "to this one and talk to Nicholas. He'll continue your training.";
next;
set ALCH_Q,20;
+ changequest 2036,2037;
mes "[Van Helmont]";
mes "What are you";
mes "still doing here?";
@@ -1656,12 +1683,16 @@ alde_alche,101,184,4 script Master Alchemist#am 122,{
cutin "",255;
end;
}
+ if(checkquest(2039) != -1) {
+ changequest 2039,2040;
+ }
mes "Ah, well done.";
mes "I can see that you";
mes "have learned all of";
mes "the basics of Alchemy.";
next;
set ALCH_Q,0;
+ completequest 2040;
set .@jlevel,JobLevel;
callfunc "Job_Change",Job_Alchemist;
callfunc "F_ClearJobVar";
@@ -1878,6 +1909,7 @@ alde_alche,145,19,1 script Chief Researcher#am 57,{
mes "help them out. They'll need all of these items to continue their experiments.";
next;
set ALCH_Q,23;
+ changequest 2037,2038;
mes "[Nicholas Flamel]";
mes "1 Mixture,";
mes "5 Burnt Tree,";
@@ -1907,6 +1939,7 @@ alde_alche,145,19,1 script Chief Researcher#am 57,{
}
else if (ALCH_Q == 24) {
set ALCH_Q,40;
+ changequest 2038,2039;
mes "[Nicholas Flamel]";
mes "Ah, you're back!";
mes "I just got a message from Bain";
diff --git a/npc/jobs/2-2/bard.txt b/npc/jobs/2-2/bard.txt
index 5df84f449..acf9a0193 100644
--- a/npc/jobs/2-2/bard.txt
+++ b/npc/jobs/2-2/bard.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Muad_Dib(The Prometheus Project), Lupus, Samuray22
//===== Current Version: =====================================
-//= 2.4
+//= 2.5
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -21,6 +21,7 @@
//= - Fixed some indentation.
//= - Changed item names to item IDs
//= 2.4 Fixed hang up on bard quest. ($kiN.) [L0ne_W0lf]
+//= 2.5 Added Quest Log commands. [Kisuka]
//============================================================
//=============== Ayealo ============================
@@ -151,6 +152,7 @@ comodo,226,123,5 script Wandering Bard 741,{
mes "It would be nice if more people went around and sang...";
mes "Well, it's quite ok as it is now... hmmhmm.";
set BARD_Q,1;
+ setquest 3000;
close2;
cutin "job_bard_aiolo01",255;
end;
@@ -207,6 +209,7 @@ comodo,226,123,5 script Wandering Bard 741,{
mes "It doesn't really matter which Flower, but try to bring one that I like.";
mes "And don't just buy any random Flower, ok?";
set BARD_Q,2;
+ changequest 3000,3001;
close2;
cutin "job_bard_aiolo01",255;
end;
@@ -409,6 +412,7 @@ comodo,226,123,5 script Wandering Bard 741,{
mes "Go there and bring back a present.";
next;
set BARD_Q,3;
+ changequest 3001,3002;
set xmas_npc,1;
mes "[Lalo]";
mes "if you become friends with ^008800Jack Frost^000000, you will receive something.";
@@ -428,6 +432,9 @@ comodo,226,123,5 script Wandering Bard 741,{
mes "Then, do you want to try singing...?";
mes "I'll sing a short melody...";
mes "and you try after.";
+ if(checkquest(3003) == -1) {
+ changequest 3002,3003;
+ }
next;
mes "[Lalo]";
mes "Here I go.";
@@ -817,6 +824,7 @@ B_Change:
cutin "job_bard_aiolo01",255;
end;
}
+ completequest 3003;
callfunc "Job_Change",Job_Bard;
callfunc "F_ClearJobVar"; //clears all job variables for the current player
mes "[Lalo]";
@@ -829,6 +837,7 @@ B_Change:
cutin "job_bard_aiolo01",255;
end;
}
+ changequest 3003,3004;
mes "[Lalo]";
mes "Hmm... very well, bring some trunks.";
mes "It doesn't matter what kind, as long as they are 60 of the same kind...";
@@ -918,6 +927,7 @@ B_Change:
end;
S_ChangeJob:
+ completequest 3004;
callfunc "Job_Change",Job_Bard;
callfunc "F_ClearJobVar";
mes "[Lalo]";
diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt
index 316d23da3..be9f2b58c 100644
--- a/npc/jobs/2-2/crusader.txt
+++ b/npc/jobs/2-2/crusader.txt
@@ -4,7 +4,7 @@
//= Made by: Black Dragon
//= Converted by: Shin
//===== Current Version: =====================================
-//= 3.1
+//= 3.2
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -30,6 +30,7 @@
//= 2.9a Deleted unused variables. [Samuray22]
//= 3.0 Updated waiting room. (Removes global var) [L0ne_W0lf]
//= 3.1 Adding Hermemton's changes. [L0ne_W0lf]
+//= 3.2 Added Quest Log commands. [Kisuka]
//============================================================
@@ -150,6 +151,7 @@ prt_castle,45,169,5 script Senior Crusader 752,{
delitem 1004, 1;
delitem 1009, 1;
set CRUS_Q,4;
+ setquest 3009;
mes "[Michael Halig]";
mes "Moorenak and others like him will test the limits of your capabilities and help you find your path. Return to me after you have completed their tests...";
close;
@@ -165,6 +167,7 @@ prt_castle,45,169,5 script Senior Crusader 752,{
set .@cru_m1,rand(1,3);
if(.@cru_m1 == 1) {
set CRUS_Q, 1;
+ setquest 3006;
mes "10 ^3355FF"+getitemname(957)+"^000000";
mes "10 ^3355FF"+getitemname(959)+"^000000";
mes "10 ^3355FF"+getitemname(1099)+"^000000";
@@ -173,6 +176,7 @@ prt_castle,45,169,5 script Senior Crusader 752,{
}
else if(.@cru_m1 == 2) {
set CRUS_Q, 2;
+ setquest 3007;
mes "10 ^3355FF"+getitemname(932)+"^000000";
mes "10 ^3355FF"+getitemname(1043)+"^000000";
mes "10 ^3355FF"+getitemname(1098)+"^000000";
@@ -181,6 +185,7 @@ prt_castle,45,169,5 script Senior Crusader 752,{
}
else {
set CRUS_Q, 3;
+ setquest 3008;
mes "10 ^3355FF"+getitemname(958)+"^000000";
mes "10 ^3355FF"+getitemname(930)+"^000000";
mes "10 ^3355FF"+getitemname(1041)+"^000000";
@@ -241,6 +246,15 @@ prt_castle,45,169,5 script Senior Crusader 752,{
delitem @item3, 10;
delitem @item4, 10;
set CRUS_Q, 4;
+ if(checkquest(3006) != -1) {
+ changequest 3006,3009;
+ }
+ else if(checkquest(3007) != -1) {
+ changequest 3007,3009;
+ }
+ else {
+ changequest 3008,3009;
+ }
mes "[Michael Halig]";
mes "Moorenak and others like him will test the limits of your capabilities and help you find your path. Return to me after you have completed their tests...";
close;
@@ -269,6 +283,7 @@ prt_castle,45,169,5 script Senior Crusader 752,{
mes "Together, let us ready ourselves and be victorious over evil and tyranny!";
next;
set .@Joblevel,JobLevel;
+ completequest 3015;
callfunc "Job_Change",Job_Crusader;
callfunc "F_ClearJobVar"; //clears all job variables for the current player
mes "[Michael Halig]";
@@ -363,6 +378,7 @@ prt_castle,164,32,1 script Man in Anguish 733,{
mes "You must keep one thing in mind. Under no condition are you allowed to kill the monsters.";
next;
set CRUS_Q,5;
+ changequest 3009,3010;
mes "[Murnak Mijoul]";
mes "Well then...";
mes "Good luck.";
@@ -706,6 +722,7 @@ C_Questions:
mes "is " + .@cru_t + " points...";
if(.@cru_t == 100) {
set CRUS_Q, 8;
+ changequest 3011,3013;
mes "Superb! Now, it's time for";
mes "you to take the next test.";
next;
@@ -718,6 +735,7 @@ C_Questions:
}
else if(.@cru_t == 90) {
set CRUS_Q, 8;
+ changequest 3011,3013;
mes "Well done~ Now, it's time for";
mes "you to take the next test.";
next;
@@ -730,6 +748,7 @@ C_Questions:
}
else if (.@cru_t == 80 && CRUS_Q == 7) {
set CRUS_Q,8;
+ changequest 3011,3013;
mes "Seems like you prepared a lot so I'll let you pass this time.";
mes "Hurry now and go take the next test.";
next;
@@ -739,6 +758,9 @@ C_Questions:
close;
}
set CRUS_Q,7;
+ if(checkquest(3011) != -1) {
+ changequest 3011,3012;
+ }
mes "Hmmm... What a pity.";
mes "Go study some more and";
mes "take this test again, okay?";
@@ -842,6 +864,9 @@ prt_castle,35,151,5 script Patron Knight 751,{
mes "[Bliant Piyord]";
mes "To take the battle test, bring";
mes "1 ^3355FFHoly Water^000000. This will be used to purify you prior to taking the test.";
+ if(checkquest(3013) != -1) {
+ changequest 3013,3014;
+ }
next;
mes "[Bliant Piyord]";
mes "Well then...";
@@ -1174,6 +1199,7 @@ OnDead:
job_cru,98,105,4 script Summoner#cr5 45,3,3,{
OnTouch:
set CRUS_Q,6;
+ changequest 3010,3011;
warp "prt_castle",164,28;
end;
}
@@ -1268,7 +1294,10 @@ OnMonster3:
OnDead:
set .MyMonsterCount,.MyMonsterCount+1;
- if (.MyMonsterCount >= 10) set CRUS_Q,10;
+ if (.MyMonsterCount >= 10) {
+ set CRUS_Q,10;
+ changequest 3014,3015;
+ }
end;
OnEnd:
diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt
index 14c61affc..a9011e0be 100644
--- a/npc/jobs/2-2/dancer.txt
+++ b/npc/jobs/2-2/dancer.txt
@@ -4,7 +4,7 @@
//= Kalen - Original jAthena
//= Fredzilla - Converted, Lupus
//===== Current Version: =====================================
-//= 3.6a
+//= 3.7
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -19,6 +19,7 @@
//= 3.5 Minor corrections to script. (bugreport:1766) [L0ne_W0lf]
//= 3.6 Applied Correction bug with for loop. [L0ne_W0lf]
//= 3.6a Fixed a little Exploit to bug the quest with a timeout. (bugreport:2252) [Samuray22]
+//= 3.7 Added Quest Log commands. [Kisuka]
//============================================================
comodo,180,153,4 script Sonotora#1 90,{
@@ -177,6 +178,7 @@ job_duncer,43,93,4 script Aile#da 724,{
close2;
cutin "",255;
set DANC_Q,1;
+ setquest 7000;
end;
}
else {
@@ -232,6 +234,7 @@ job_duncer,43,93,4 script Aile#da 724,{
set .@item_nd,rand(1,10);
if (.@item_nd > 0 && .@item_nd < 3) {
set DANC_Q,2;
+ changequest 7000,7001;
mes "[Aile]";
mes "First, there's the tuition fee of ^CD688910,000 Zeny^000000. Then, you'll about ^CD688920 Sticky Mucus^000000 for shoe polish.";
next;
@@ -248,6 +251,7 @@ job_duncer,43,93,4 script Aile#da 724,{
}
else if (.@item_nd == 4) {
set DANC_Q,3;
+ changequest 7000,7002;
mes "[Aile]";
mes "First, there's the tuition fee of ^CD688910,000 Zeny^000000. Then, bring ^CD68895 Earthworm Peelings^000000 for polishing the floor and, of course, a pair of ^CD6889Boots^000000.";
next;
@@ -259,6 +263,7 @@ job_duncer,43,93,4 script Aile#da 724,{
}
else {
set DANC_Q,4;
+ changequest 7000,7003;
mes "[Aile]";
mes "First, there's the tuition fee of ^CD688910,000 Zeny^000000. Then, bring ^CD68892 Clam Shells^000000 for your costume, ^CD68895 Yellow Potions^000000 and ^CD688920 Jellopy^000000 to treat foot injuries.";
next;
@@ -316,6 +321,15 @@ job_duncer,43,93,4 script Aile#da 724,{
mes "[Aile]";
mes "Next, go to ^CD6889Bijou^000000, who is in charge of the interviewing process. She will have a couple of things she'll need to ask you.";
set DANC_Q,5;
+ if(checkquest(7001) != -1) {
+ changequest 7001,7004;
+ }
+ else if(checkquest(7002) != -1) {
+ changequest 7002,7004;
+ }
+ else {
+ changequest 7003,7004;
+ }
close2;
cutin "",255;
end;
@@ -817,6 +831,7 @@ job_duncer,95,93,4 script Bijou#da 101,{
mes "[Bijou]";
mes "Well then~";
mes "Good luck...!!";
+ changequest 7004,7005;
set DANC_Q,8;
close2;
warp "job_duncer",105,109;
@@ -856,6 +871,7 @@ job_duncer,95,93,4 script Bijou#da 101,{
next;
set .@jlevel,JobLevel;
mes "[Bijou]";
+ completequest 7006;
callfunc "Job_Change",Job_Dancer;
callfunc "F_ClearJobVar";
mes "Ooh...!";
@@ -1220,6 +1236,7 @@ job_duncer,69,110,0 script dance#return -1,1,4,{
OnTouch:
mapannounce "job_duncer","Good! Well done! Go back to Bijou!",bc_map;
set DANC_Q,9;
+ changequest 7005,7006;
warp "comodo",188,162;
end;
diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt
index 2f031c4f9..f5b2d2997 100644
--- a/npc/jobs/2-2/monk.txt
+++ b/npc/jobs/2-2/monk.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Dino9021, Edited / Translated by Celest
//===== Current Version: =====================================
-//= 2.3a
+//= 2.4
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -14,6 +14,7 @@
//= No longer uses function "F_BlockHigh"
//= 2.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
//= 2.3a Deleted unused variables. [Samuray22]
+//= 2.4 Added Quest Log commands. [Kisuka]
//============================================================
prt_monk,59,247,1 script Guarding Monk#mk 120,6,2,{
@@ -76,6 +77,7 @@ prt_monk,59,247,1 script Guarding Monk#mk 120,6,2,{
mes "That is good. Go see our sensei Moohae. Speak with him.";
mes "He will help you start your training.";
set MONK_Q,2;
+ setquest 3016;
close;
}
else if (BaseJob == Job_Acolyte && JobLevel < 40) {
@@ -138,6 +140,7 @@ prt_monk,59,247,1 script Guarding Monk#mk 120,6,2,{
mes "That is good. Go see our sensei Moohae. Speak with him.";
mes "He will help you start your training.";
set MONK_Q,2;
+ setquest 3016;
close;
}
else if (BaseJob == Job_Acolyte && JobLevel < 40) {
@@ -220,6 +223,7 @@ prt_monk,59,247,1 script Guarding Monk#mk 120,6,2,{
mes "That is good. Go see our sensei Moohae, speak with him";
mes "and he will help you start new training.";
set MONK_Q,2;
+ setquest 3016;
close;
}
else if (BaseJob == Job_Acolyte && JobLevel < 40) {
@@ -375,13 +379,13 @@ monk_in,99,58,1 script Sensei Moohae#mk 60,{
mes "Let us start with a simple task.";
next;
switch(rand(1,7)) {
- case 1: setarray .@items[0], 938,5, 1055,10, 511,20, 3; break;
- case 2: setarray .@items[0], 942,20, 1002,5, 510,3, 4; break;
- case 3: setarray .@items[0], 905,30, 909,5, 955,10, 5; break;
- case 4: setarray .@items[0], 943,5, 935,20, 912,5, 6; break;
- case 5: setarray .@items[0], 7053,5, 509,10, 508,10, 7; break;
- case 6: setarray .@items[0], 913,10, 948,4, 7033,20, 8; break;
- case 7: setarray .@items[0], 1027,5, 1025,20, 1042,10, 9; break;
+ case 1: setarray .@items[0], 938,5, 1055,10, 511,20, 3; changequest 3016,3017; break;
+ case 2: setarray .@items[0], 942,20, 1002,5, 510,3, 4; changequest 3016,3018; break;
+ case 3: setarray .@items[0], 905,30, 909,5, 955,10, 5; changequest 3016,3019; break;
+ case 4: setarray .@items[0], 943,5, 935,20, 912,5, 6; changequest 3016,3020; break;
+ case 5: setarray .@items[0], 7053,5, 509,10, 508,10, 7; changequest 3016,3021; break;
+ case 6: setarray .@items[0], 913,10, 948,4, 7033,20, 8; changequest 3016,3022; break;
+ case 7: setarray .@items[0], 1027,5, 1025,20, 1042,10, 9; changequest 3016,3023; break;
}
mes "[Sensei Moohae]";
mes .@items[1]+" "+getitemname(.@items[0])+",";
@@ -416,6 +420,7 @@ monk_in,99,58,1 script Sensei Moohae#mk 60,{
mes "Well done, you found all the items.";
mes "I will tell this to the elders.";
set MONK_Q,10;
+ changequest 3017,3024;
delitem 938,5; //Sticky_Mucus
delitem 1055,10; //Earthworm_Peeling
delitem 511,20; //Green_Herb
@@ -446,6 +451,7 @@ monk_in,99,58,1 script Sensei Moohae#mk 60,{
mes "Very good, you found all the items.";
mes "I will tell this to the elders.";
set MONK_Q,10;
+ changequest 3018,3024;
delitem 942,20; //Yoyo_Tail
delitem 1002,5; //Iron_Ore
delitem 510,3; //Blue_Herb
@@ -476,6 +482,7 @@ monk_in,99,58,1 script Sensei Moohae#mk 60,{
mes "See, that wasn't so bad you real found all the items.";
mes "I will tell this to the elders.";
set MONK_Q,10;
+ changequest 3019,3024;
delitem 905,30; //Stem
delitem 909,5; //Jellopy
delitem 955,10; //Worm_Peelings
@@ -506,6 +513,7 @@ monk_in,99,58,1 script Sensei Moohae#mk 60,{
mes "Impressive, you really found all the items.";
mes "I will tell this to the elders.";
set MONK_Q,10;
+ changequest 3020,3024;
delitem 943,5; //Solid_Shell
delitem 935,20; //Shell
delitem 912,5; //Zargon
@@ -536,6 +544,7 @@ monk_in,99,58,1 script Sensei Moohae#mk 60,{
mes "Very nice, you found all the items.";
mes "I will tell this to the elders.";
set MONK_Q,10;
+ changequest 3021,3024;
delitem 7053,5; //Cyfar
delitem 509,10; //White_Herb
delitem 508,10; //Yellow_Herb
@@ -566,6 +575,7 @@ monk_in,99,58,1 script Sensei Moohae#mk 60,{
mes "Excellent, all the items I asked for.";
mes "I will tell this to the elders.";
set MONK_Q,10;
+ changequest 3022,3024;
delitem 913,10; //Tooth_Of_Bat
delitem 948,5; //Bear's_Foot
delitem 7033,20; //Poison_Spore
@@ -596,6 +606,7 @@ monk_in,99,58,1 script Sensei Moohae#mk 60,{
mes "Wow, you found all the items!!";
mes "I will tell this to the elders.";
set MONK_Q,10;
+ changequest 3023,3024;
delitem 1027,5; //Porcupine_Spike
delitem 1025,20; //Spiderweb
delitem 1042,10; //Short_Leg
@@ -830,6 +841,7 @@ monk_in,99,58,1 script Sensei Moohae#mk 60,{
mes "....and see life through the eyes of a monk.";
next;
set .@jlevel,JobLevel;
+ completequest 3032;
callfunc "Job_Change",Job_Monk;
callfunc "F_ClearJobVar";
mes "[Sensei Moohae]";
@@ -924,6 +936,7 @@ prt_monk,251,255,1 script Touha#mk 79,{
mes "Please repeat after me.";
next;
mes "[Touha]";
+ changequest 3024,3025;
switch(rand(1,3)) {
case 1:
set MONK_Q,11;
@@ -1580,6 +1593,7 @@ L_MonkOath3:
next;
if (.@monk_t > 90) {
set MONK_Q,14;
+ changequest 3025,3026;
mes "[Touha]";
mes "...well done, that was perfect. You pay attention well...";
next;
@@ -1868,12 +1882,14 @@ prt_monk,57,179,1 script Boohae#mk 110,{
next;
if (select("Gathering mushrooms:Marathon") == 1) {
set MONK_Q,15;
+ changequest 3026,3027;
mes "[Boohae]";
mes "Hmm....gathering mushrooms. So you want to test your tolerance huh?";
mes "Go prepare and come back later when you're ready.";
close;
}
set MONK_Q,16;
+ changequest 3026,3028;
mes "[Boohae]";
mes "Good choice. Forcing your physical limits to their boundaries and grants a higher amount of self control.";
mes "Go prepare and come back later when you're ready.";
@@ -2046,6 +2062,7 @@ monk_test,386,388,4 script Apprentice Monk#mk 110,{
mapannounce "monk_test","" + strcharinfo(0) + "...q.q..q. .quit! ...the marathon!! Y...you do not have what it takes to be a m... monk!",bc_map;
close2;
set MONK_Q,15;
+ changequest 3028,3027;
warp "prt_monk",194,168;
end;
}
@@ -2064,6 +2081,7 @@ OnTouch:
}
else if (MONK_Q == 24) {
set MONK_Q,25;
+ changequest 3028,3029;
mapannounce "monk_test","Now! This is the last lap!! If you make it you need to go visit Tomoon for the next test!",bc_map;
warp "monk_test",385,388;
end;
@@ -2130,6 +2148,7 @@ job_monk,225,180,1 script Hyunmoo#mk 89,{
mapannounce "job_monk","" + strcharinfo(0) + ", has quit his testing to become a monk.",bc_map;
close2;
set MONK_Q,16;
+ changequest 3027,3028;
warp "prt_monk",194,168;
end;
}
@@ -2176,6 +2195,7 @@ job_monk,225,180,1 script Hyunmoo#mk 89,{
mapannounce "job_monk","" + strcharinfo(0) + ", has quit his training to become a monk.",bc_map;
warp "prt_monk",194,168;
set MONK_Q,16;
+ changequest 3027,3028;
end;
}
else if (MONK_Q > 14 && MONK_Q < 25 && (countitem(1069) > 29 || countitem(1070) > 29)) {
@@ -2187,6 +2207,7 @@ job_monk,225,180,1 script Hyunmoo#mk 89,{
mes "Go meet Tomoon for your next test.";
mes "Tomoon is staying in the deepest room inside a building near this abbey.";
set MONK_Q,25;
+ changequest 3027,3029;
delitem 1069,countitem(1069); //Mushroom_Of_Thief_1
delitem 1070,countitem(1070); //Mushroom_Of_Thief_2
close2;
@@ -2268,6 +2289,7 @@ monk_test,319,139,1 script Tomoon#mk 52,{
mes "Let's see if you got what it takes to be a true monk!!";
close2;
set MONK_Q,26;
+ changequest 3029,3031;
warp "monk_test",88,74;
end;
}
@@ -2290,6 +2312,7 @@ monk_test,319,139,1 script Tomoon#mk 52,{
mes "Drink this potion and you will be able to become a monk!!!";
mes "... now go back to sensei Moohae!!!";
set MONK_Q,28;
+ changequest 3031,3032;
close;
}
else if (MONK_Q == 28) {
diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt
index cf03af747..43d8bebbc 100644
--- a/npc/jobs/2-2/rogue.txt
+++ b/npc/jobs/2-2/rogue.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 2.8
+//= 2.9
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -20,6 +20,7 @@
//= 2.6 Fixed a few bugs in the Rogue Guildsman. [L0ne_W0lf]
//= 2.7 Fixed a bug on Markie question 5, bugreport:1600 [Brainstorm]
//= 2.8 Moved "Thug" to Morroc Ruins. [L0ne_W0lf]
+//= 2.9 Added Quest Log commands. [Kisuka]
//============================================================
moc_ruins,86,103,1 script Thug#rg 118,{
@@ -146,6 +147,7 @@ in_rogue,363,122,4 script Rogue Guildsman#rg 747,{
close;
}
else if (ROGUE_Q == 16 || ROGUE_Q == 17) {
+ changequest 2026,2027;
mes "[Markie]";
if (ROGUE_Q == 16) {
mes "Oh hey, it's you!";
@@ -171,6 +173,7 @@ in_rogue,363,122,4 script Rogue Guildsman#rg 747,{
set .@jlevel,JobLevel;
callfunc "Job_Change",Job_Rogue;
callfunc "F_ClearJobVar";
+ completequest 2027;
next;
mes "[Markie]";
mes "Now...";
@@ -419,6 +422,7 @@ in_rogue,363,122,4 script Rogue Guildsman#rg 747,{
mes "" + .@assassin_t + " points.";
if (.@assassin_t > 80) {
set ROGUE_Q,2;
+ setquest 2017;
mes "Good. You passed.";
mes "We don't gotta";
mes "do that again.";
@@ -512,6 +516,7 @@ in_rogue,376,23,1 script Mr. Smith#rg 57,{
mes "[Mr. Smith]";
mes "I will let you know...";
set ROGUE_Q,6;
+ changequest 2017,2021;
next;
mes "[Mr. Smith]";
mes "I will let you know......";
@@ -684,6 +689,7 @@ in_rogue,376,23,1 script Mr. Smith#rg 57,{
mes "^CCCCCC- Middle Finger -^000000'";
mes "*Grins*";
set ROGUE_Q,8;
+ changequest 2021,2025;
next;
mes "[Mr. Smith]";
mes "Since you showed such great effort, I'm going to write a recommendation letter for you. I usually don't do that, you know.";
@@ -753,6 +759,15 @@ in_rogue,376,23,1 script Mr. Smith#rg 57,{
switch(rand(1,3)) {
case 1:
set ROGUE_Q,9;
+ if(checkquest(2018) != -1) {
+ changequest 2018,2022;
+ }
+ else if(checkquest(2019) != -1) {
+ changequest 2019,2022;
+ }
+ else {
+ changequest 2020,2022;
+ }
next;
mes "[Mr. Smith]";
mes "Right! I know";
@@ -781,6 +796,15 @@ in_rogue,376,23,1 script Mr. Smith#rg 57,{
close;
case 2:
set ROGUE_Q,10;
+ if(checkquest(2018) != -1) {
+ changequest 2018,2023;
+ }
+ else if(checkquest(2019) != -1) {
+ changequest 2019,2023;
+ }
+ else {
+ changequest 2020,2023;
+ }
next;
mes "[Mr. Smith]";
mes "Hmm...";
@@ -808,6 +832,15 @@ in_rogue,376,23,1 script Mr. Smith#rg 57,{
close;
case 3:
set ROGUE_Q,11;
+ if(checkquest(2018) != -1) {
+ changequest 2018,2024;
+ }
+ else if(checkquest(2019) != -1) {
+ changequest 2019,2024;
+ }
+ else {
+ changequest 2020,2024;
+ }
next;
mes "[Mr. Smith]";
mes "Hmm...";
@@ -914,6 +947,15 @@ S_Req:
mes "^FF0000"+getarg(2)+"^000000 and";
mes "^FF0000"+getarg(3)+"^000000.";
set ROGUE_Q,getarg(4);
+ if(getarg(4) == 3) {
+ changequest 2017,2018;
+ }
+ else if(getarg(4) == 4) {
+ changequest 2017,2019;
+ }
+ else {
+ changequest 2017,2020;
+ }
next;
mes "[Mr. Smith]";
mes "Hmm...?";
@@ -1211,6 +1253,7 @@ in_rogue,272,135,1 script Hermanthorn Jr#rg 85,{
mes "Well...";
mes "Just make it back to the Rogue Guild alive. That's all you have to do!";
set ROGUE_Q,12;
+ changequest 2025,2026;
close;
}
else if (ROGUE_Q == 12) {
@@ -1383,6 +1426,7 @@ in_rogue,244,39,1 script Aragham Junior#rg 99,{
close2;
warp "in_rogue",15,105;
set ROGUE_Q,13;
+ changequest 2022,2026;
end;
}
mes "[Aragham Jr.]";
@@ -1463,6 +1507,7 @@ in_rogue,160,34,1 script Hollgrehenn junior#rg 85,{
close2;
warp "in_rogue",15,105;
set ROGUE_Q,15;
+ changequest 2024,2026;
end;
}
mes "[Hollgrehenn Jr.]";
@@ -1549,6 +1594,7 @@ in_rogue,177,109,1 script Antonio junior#rg 88,{
close2;
warp "in_rogue",15,105;
set ROGUE_Q,14;
+ changequest 2023,2026;
end;
}
mes "[Antonio Jr.]";
diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt
index a93bd68d0..e4b4a4f64 100644
--- a/npc/jobs/2-2/sage.txt
+++ b/npc/jobs/2-2/sage.txt
@@ -5,7 +5,7 @@
//= Unknown Translator (1.0)
//= Darkchild (1.2)
//===== Current Version: =====================================
-//= 2.6a
+//= 2.7
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -25,6 +25,7 @@
// -And Small Typo Error
//= 2.6 Fixed Kayron Grik cutin not being removed as reported by jc1991, bugreport:1825 [Brainstorm]
//= 2.6a Fixed a Little Bug with Whispers Summoned in the Last Test. (bugreport:2253) [Samuray22]
+//= 2.7 Added Quest Log commands. [Kisuka]
//============================================================
yuno_in02,38,61,5 script Dean of the Academy#sa 743,{
@@ -156,6 +157,7 @@ yuno_in02,38,61,5 script Dean of the Academy#sa 743,{
mes "Although it's roughly written, it's well done for a beginner.";
mes "Ah yes...you seem to be proficient in studying.";
next;
+ completequest 2052;
callfunc "Job_Change",Job_Sage;
callfunc "F_ClearJobVar";
mes "[Kayron Grik]";
@@ -329,6 +331,7 @@ yuno_in03,154,35,4 script Staff of the Academy#a 742,{
mes "Yes, everything's ready.";
mes "Next, you will take an entrance test.";
set SAGE_Q,4;
+ setquest 2041;
next;
mes "[Metheus Sylphe]";
mes "Please visit Professor Claytos.";
@@ -346,6 +349,7 @@ yuno_in03,154,35,4 script Staff of the Academy#a 742,{
mes "Thank you, your application has been accepted.";
mes "Next, you will take an entrance test.";
set SAGE_Q,4;
+ setquest 2041;
next;
mes "[Metheus Sylphe]";
mes "Please visit Professor Claytos.";
@@ -364,6 +368,7 @@ yuno_in03,154,35,4 script Staff of the Academy#a 742,{
mes "Thank you, your application has been accepted.";
mes "Next, you will take the entrance test.";
set SAGE_Q,4;
+ setquest 2041;
next;
mes "[Metheus Sylphe]";
mes "Please visit Professor Claytos.";
@@ -402,6 +407,7 @@ yuno_in03,154,35,4 script Staff of the Academy#a 742,{
mes "Yes, everything's ready.";
mes "Next, you will take the entrance test.";
set SAGE_Q,4;
+ setquest 2041;
next;
mes "[Metheus Sylphe]";
mes "Please visit professor Claytos.";
@@ -434,6 +440,7 @@ yuno_in03,154,35,4 script Staff of the Academy#a 742,{
switch(rand(1,3)) {
case 1:
set SAGE_Q,1;
+ setquest 2043;
mes "[Metheus Sylphe]";
mes "Please gather the following items.";
mes "50 ^3355FFFeather of Birds^000000";
@@ -445,6 +452,7 @@ yuno_in03,154,35,4 script Staff of the Academy#a 742,{
break;
case 2:
set SAGE_Q,2;
+ setquest 2044;
mes "[Metheus Sylphe]";
mes "Please gather the following items.";
mes "50 ^3355FFClover^000000";
@@ -456,6 +464,7 @@ yuno_in03,154,35,4 script Staff of the Academy#a 742,{
break;
case 3:
set SAGE_Q,3;
+ setquest 2045;
mes "[Metheus Sylphe]";
mes "Please gather the following items.";
mes "50 ^3355FFFeather of Birds^000000";
@@ -587,6 +596,18 @@ yuno_in03,154,35,4 script Staff of the Academy#a 742,{
mes "Ah yes, everything is in readiness.";
mes "Next, you will take an entrance test.";
set SAGE_Q,4;
+ if(checkquest(2043) != -1) {
+ changequest 2043,2041;
+ }
+ else if(checkquest(2044) != -1) {
+ changequest 2044,2041;
+ }
+ else if(checkquest(2045) != -1) {
+ changequest 2045,2041;
+ }
+ else {
+ setquest 2041;
+ }
next;
mes "[Metheus Sylphe]";
mes "Please visit Professor Claytos.";
@@ -958,6 +979,7 @@ L_AskQuestions:
else
mes "Excellent! You must have studed really hard for this test!";
set SAGE_Q,6;
+ changequest 2041,2046;
next;
mes "[Claytos Verdo]";
mes "You have passed the written test.";
@@ -965,6 +987,7 @@ L_AskQuestions:
}
else if (.@sage_t >= 80) {
set SAGE_Q,6;
+ changequest 2041,2046;
mes "Yeah, not bad. I assume that you will at least understand what you're going to learn in class.";
next;
mes "[Claytos Verdo]";
@@ -1152,6 +1175,7 @@ yuno_in03,169,180,3 script Practical Examination P 755,{
switch(rand(1,3)) {
case 1:
set SAGE_Q,9;
+ changequest 2046,2047;
mes "[Hermes Tris]";
mes "Now, you will study Yggdrasil.";
mes "Yggdrasil is the tree that was rumored to be the source of life for this world.";
@@ -1165,6 +1189,7 @@ yuno_in03,169,180,3 script Practical Examination P 755,{
close;
case 2:
set SAGE_Q,11;
+ changequest 2046,2048;
mes "[Hermes Tris]";
mes "Now, you will study monsters.";
mes "The purpose of this study is to learn and understand more about creatures existing all over the continent.";
@@ -1178,6 +1203,7 @@ yuno_in03,169,180,3 script Practical Examination P 755,{
close;
case 3:
set SAGE_Q,13;
+ changequest 2046,2049;
mes "[Hermes Tris]";
mes "Now, you will study magic skills that have certain properties.";
mes "The purpose of this study is to better understand basic magic skills that we use in everyday life.";
@@ -1322,6 +1348,7 @@ yuno_in03,62,176,2 script History Professor#sa 109,{
mes "Seeds or fruits of the tree would be good. I know it's difficult to find, but please try.";
next;
set SAGE_Q2,1;
+ changequest 2047,2050;
mes "[Saphien Layless]";
mes "When we have the reserve items, we will start the class.";
mes "Please come back.";
@@ -1447,6 +1474,7 @@ yuno_in03,62,176,2 script History Professor#sa 109,{
next;
set SAGE_Q2,0;
set SAGE_Q,10;
+ changequest 2050,2051;
mes "[Saphien Layless]";
mes "I will help you to write your thesis when you're ready with all those items.";
mes "I am looking forward to the next class with you.";
@@ -1625,6 +1653,7 @@ yuno_in03,62,176,2 script History Professor#sa 109,{
mes ".................................";
next;
set SAGE_Q,15;
+ changequest 2051,2052;
mes "[Saphien Layless]";
mes "Oh, did you finish already? Well done.";
mes "Please handle this with care, because you won't be able to do this ever again.";
@@ -1737,6 +1766,7 @@ yuno_in03,32,102,1 script Biology Professor#sa 755,{
next;
if (sage_m4 == 1) {
set SAGE_Q2,1;
+ changequest 2048,2053;
mes "[Lucius Celsus]";
mes "Go bring the following items to me.";
mes "5 ^3355FFTentacle^000000,";
@@ -1745,6 +1775,7 @@ yuno_in03,32,102,1 script Biology Professor#sa 755,{
}
else if (sage_m4 == 2) {
set SAGE_Q2,2;
+ changequest 2048,2054;
mes "[Lucius Celsus]";
mes "Go bring the following items to me.";
mes "5 ^3355FFNipper^000000,";
@@ -1753,6 +1784,7 @@ yuno_in03,32,102,1 script Biology Professor#sa 755,{
}
else {
set SAGE_Q2,3;
+ changequest 2048,2054;
mes "[Lucius Celsus]";
mes "Go bring following items to me.";
mes "5 ^3355FFTendon^000000,";
@@ -1850,24 +1882,60 @@ yuno_in03,32,102,1 script Biology Professor#sa 755,{
switch(rand(1,4)) {
case 1:
set SAGE_Q2,4;
+ if(checkquest(2053) != -1) {
+ changequest 2053,2056;
+ }
+ else if(checkquest(2054) != -1) {
+ changequest 2054,2056;
+ }
+ else {
+ changequest 2055,2056;
+ }
mes "5 ^3355FFCobweb^000000,";
mes "5 ^3355FFShell^000000,";
mes "5 ^3355FFInsect Feeler^000000.";
break;
case 2:
set SAGE_Q2,5;
+ if(checkquest(2053) != -1) {
+ changequest 2053,2057;
+ }
+ else if(checkquest(2054) != -1) {
+ changequest 2054,2057;
+ }
+ else {
+ changequest 2055,2057;
+ }
mes "5 ^3355FFHorn^000000,";
mes "5 ^3355FFSnail's Shell^000000,";
mes "5 ^3355FFMoth Dust^000000.";
break;
case 3:
set SAGE_Q2,6;
+ if(checkquest(2053) != -1) {
+ changequest 2053,2058;
+ }
+ else if(checkquest(2054) != -1) {
+ changequest 2054,2058;
+ }
+ else {
+ changequest 2055,2058;
+ }
mes "5 ^3355FFMantis Scythe^000000,";
mes "5 ^3355FFWorm Peeling^000000,";
mes "5 ^3355FFRainbow Shell^000000.";
break;
case 4:
set SAGE_Q2,7;
+ if(checkquest(2053) != -1) {
+ changequest 2053,2059;
+ }
+ else if(checkquest(2054) != -1) {
+ changequest 2054,2059;
+ }
+ else {
+ changequest 2055,2059;
+ }
mes "5 ^3355FFCobweb^000000,";
mes "5 ^3355FFMantis Scythe^000000,";
mes "5 ^3355FFSolid Shell^000000.";
@@ -1935,6 +2003,18 @@ yuno_in03,32,102,1 script Biology Professor#sa 755,{
next;
set SAGE_Q2,0;
set SAGE_Q,12;
+ if(checkquest(2056) != -1) {
+ changequest 2056,2051;
+ }
+ else if(checkquest(2057) != -1) {
+ changequest 2057,2051;
+ }
+ else if(checkquest(2058) != -1) {
+ changequest 2058,2051;
+ }
+ else {
+ changequest 2059,2051;
+ }
mes "[Lucius Celsus]";
mes "I will help you in writing the thesis when you bring all of those items.";
mes "You're almost there. Isn't learning easy?";
@@ -1996,6 +2076,7 @@ yuno_in03,32,102,1 script Biology Professor#sa 755,{
mes ".................................";
next;
set SAGE_Q,15;
+ changequest 2051,2052;
mes "[Lucius Celsus]";
mes "Are you done? Okay, then it's over.";
mes "You won't be able to write another thesis again, handle this with care.";
@@ -2100,6 +2181,7 @@ yuno_in03,244,31,3 script Physics Professor#sa 120,{
mes "It's not so hard, isn't it?";
next;
set SAGE_Q2,1;
+ changequest 2049,2060;
mes "[Aebecee George]";
mes "Why don't you ask a thief pal for help?";
mes "We'll start the class when you bring me those stones~ Tee hee~";
@@ -2135,6 +2217,7 @@ yuno_in03,244,31,3 script Physics Professor#sa 120,{
mes "I will give you these elemental ores...but...they are not for free.";
mes "Whoa there cowboy! Don't pull out so soon~ Listen, tee hee~";
set SAGE_Q2,2;
+ changequest 2060,2061;
next;
mes "[Aebecee George]";
mes "Please make arrows using these items and bring them to me, pretty please~";
@@ -2193,6 +2276,7 @@ yuno_in03,244,31,3 script Physics Professor#sa 120,{
mes "When you come to the next class, bring ^3355FF1 Holy Water^000000~";
mes "I hope you have at least one Priest friend. Oh, you don't? Well, it couldn't hurt to get friendly with one.";
set SAGE_Q2,3;
+ changequest 2061,2062;
close;
}
else {
@@ -2242,6 +2326,7 @@ yuno_in03,244,31,3 script Physics Professor#sa 120,{
mes "Tee hee~ yes! Yes! I am the best teacher in the world! Oh, I am on fire! Tee hee~";
set SAGE_Q2,0;
set SAGE_Q,14;
+ changequest 2062,2051;
next;
mes "[Aebecee George]";
mes "Okay, please gather these items so you can write the thesis, dear~ Tee hee~";
@@ -2408,6 +2493,7 @@ yuno_in03,244,31,3 script Physics Professor#sa 120,{
mes ".................................";
next;
set SAGE_Q,15;
+ changequest 2051,2052;
mes "[Aebecee George]";
mes "Tee hee, so... are you done with your thesis? What do you think of your work? I think you did fine~";
mes "Don't forget, this is the first and the last time you'll write a thesis, okay? Tee hee~";