Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Removed usage of the 'goto' command from job quests.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14351 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
L0ne_W0lf 2010-06-21 15:25:44 +00:00
parent 8b8556c220
commit f77b5c0727
13 changed files with 1567 additions and 1631 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
npc/Changelog.txt
View File

@ -1,5 +1,7 @@
Date Added
======
2010/06/21
* Rev. 14351 Removed usage of the 'goto' command from job quests. [L0ne_W0lf]
2010/06/20
* Rev. 14350 Corrected Einbech Mine warps. [Gepard]
2010/06/18

9
npc/jobs/1-1e/taekwon.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= Tsuyuki & Samuray22
//===== Current Version: =====================================
//= 1.3
//= 1.4
//===== Compatible With: =====================================
//= eAthena/Freya
//===== Description: =========================================
@ -13,6 +13,7 @@
//= 1.1 Rewrote to the Aegis Standars. [Samuray22]
//= 1.2 Fixed position the npc is facing. [Kisuka]
//= 1.3 Added Quest Log commands. [Kisuka]
//= 1.4 Removed use of 'goto', and fixed some indentation. [L0ne_W0lf]
//============================================================
@ -62,9 +63,7 @@ payon,157,141,5 script Phoenix#TKJobChange 753,{
mes "I know that the answer";
mes "will come in time...";
next;
if (Class == Job_Novice && TK_Q == 0) {
goto L_change;
}
if (Class != Job_Novice && TK_Q != 0) {
mes "[Phoenix]";
mes "Noble adventurer:";
mes "if you know anyone who";
@ -73,7 +72,7 @@ payon,157,141,5 script Phoenix#TKJobChange 753,{
mes "him to me. If interested,";
mes "I may teach him my art...";
close;
L_change:
}
mes "[Phoenix]";
mes "If you have not decided on";
mes "the path you wish to take in";

67
npc/jobs/2-1/assassin.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
//= 3.3
//= 3.4
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@ -46,6 +46,7 @@
//= 3.1b Fixed waiting room not enabled in some situations [Zephyrus]
//= 3.2 Fixed a question having all correct answers. [brianluau]
//= 3.3 Added Quest Log commands. [Kisuka]
//= 3.4 Removed the need for use of 'goto.' [L0ne_W0lf]
//============================================================
in_moc_16,19,33,1 script Guildsman#asn 55,{
@ -660,6 +661,7 @@ OnTouch:
in_moc_16,19,154,0 script nameless_one -1,8,2,{
OnTouch:
if (ASSIN_Q2 < 5) {
if (ASSIN_Q2 < 3) {
mes "[The Anonymous One]";
mes "Welcome, guest.";
@ -804,8 +806,37 @@ OnTouch:
mes "[The Anonymous One]";
mes "Are you ready?";
mes "Prepare yourself!";
}
else if (ASSIN_Q2 < 5) {
mes "[The Anonymous One]";
mes "Having problems";
mes "passing a simple test?";
mes "You should have";
mes "known better.";
next;
if (select("Help me, how do I pass?:I challenge you again!") == 1) {
mes "[The Anonymous One]";
mes "Well, that's a damn good question. But you're banished from the Assassin Guild, so it's no concern of mine...";
close2;
warp "moc_fild16",206,151;
end;
}
mes "[The Anonymous One]";
mes "So I see...";
mes "Now go, but do not fear. I will be by your side as you learn the outcome of your choice...";
next;
mes "[The Anonymous One]";
mes "Now, we shall test you once more! Keep in mind, you must answer 9 questions out of 10 correctly. Remember I am doing you a favor...";
next;
mes "[The Anonymous One]";
mes "You must answer 9 questions out of 10 correctly. If you miss more then one question, you can never become an Assassin.";
next;
mes "[The Anonymous One]";
mes "Okay,";
mes "are you ready?";
mes "Good luck.";
}
next;
L_AskQuestions:
switch(rand(1,3)) {
case 1:
mes "[The Anonymous One]";
@ -1056,43 +1087,11 @@ L_AskQuestions:
}
}
}
else if (ASSIN_Q2 < 5) {
mes "[The Anonymous One]";
mes "Having problems";
mes "passing a simple test?";
mes "You should have";
mes "known better.";
next;
if (select("Help me, how do I pass?:I challenge you again!") == 1) {
mes "[The Anonymous One]";
mes "Well, that's a damn good question. But you're banished from the Assassin Guild, so it's no concern of mine...";
close2;
warp "moc_fild16",206,151;
end;
}
mes "[The Anonymous One]";
mes "So I see...";
mes "Now go, but do not fear. I will be by your side as you learn the outcome of your choice...";
next;
mes "[The Anonymous One]";
mes "Now, we shall test you once more! Keep in mind, you must answer 9 questions out of 10 correctly. Remember I am doing you a favor...";
next;
mes "[The Anonymous One]";
mes "You must answer 9 questions out of 10 correctly. If you miss more then one question, you can never become an Assassin.";
next;
mes "[The Anonymous One]";
mes "Okay,";
mes "are you ready?";
mes "Good luck.";
next;
goto L_AskQuestions;
}
else {
mes "[The Anonymous One]";
mes "...I will keep watching you.";
close;
}
}
in_moc_16,21,165,2 script Standby Room#ASNTEST 725,{

30
npc/jobs/2-1/blacksmith.txt
View File

@ -7,7 +7,7 @@
//= Optimized and further edited by kobra_k88.
//= Further bugfixed and tested by Lupus
//===== Current Version: =====================================
//= 2.7
//= 2.8
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@ -39,6 +39,7 @@
//= 2.6 Fixed 4 bugs [Lupus]
//= 2.6a Typo fix [Yommy]
//= 2.7 Added Quest Log commands. [Kisuka]
//= 2.8 Removed the need for use of 'goto.' [L0ne_W0lf]
//==============================================================
ein_in01,18,28,4 script Guildsman#BLS 731,{
@ -305,7 +306,8 @@ ein_in01,201,27,3 script Guildsman#alberta 63,{
mes "to be busy~";
close;
}
else if (BSMITH_Q == 1) {
else if ((BSMITH_Q == 1) || (BSMITH_Q == 2)) {
if (BSMITH_Q == 1) {
mes "[Geschupenschte]";
mes "Am I correct in assuming you are the help sent by the Blacksmith Guild? There aren't many trustyworthy people I can hire to help me, so I'm always";
mes "short on help.";
@ -324,8 +326,26 @@ ein_in01,201,27,3 script Guildsman#alberta 63,{
mes "[Geschupenschte]";
mes "However, I want to make sure that you have some basic knowledge as a Merchant. I'd like to ask you some questions, if that's okay.";
next;
if (select("Yes.:Um, can I have some time to prepare?") == 1) {
L_AskQuestions:
set .@selection,select("Yes.:Um, can I have some time to prepare?");
}
else if (BSMITH_Q == 2) {
mes "[Geschupenschte]";
mes "So, have you";
mes "studied a little";
mes "more this time?";
next;
mes "[Geschupenschte]";
mes "I admit that it's pretty unreasonable to expect anyone to get a perfect score the first time around, so I'll give you";
mes "a little break...";
next;
mes "[Geschupenschte]";
mes "You can miss";
mes "one problem!";
mes "Alright, let's start";
mes "with the questions~";
next;
}
if (.@selection != 2) {
if (rand(2)) {
mes "[Geschupenschte]";
mes "1. Which one of the following regions is matched incorrectly";
@ -506,6 +526,7 @@ L_AskQuestions:
mes "being careful~";
close;
}
/*
else if (BSMITH_Q == 2) {
mes "[Geschupenschte]";
mes "So, have you";
@ -524,6 +545,7 @@ L_AskQuestions:
next;
goto L_AskQuestions;
}
*/
else if (BSMITH_Q == 3) {
mes "[Geschupenschte]";
mes "Hmm...";

90
npc/jobs/2-1/hunter.txt
View File

@ -5,7 +5,7 @@
//= Converted by kobra_k88
//= Further bugfixed and tested by Lupus
//===== Current Version: =====================================
//= 3.5
//= 3.6
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@ -51,6 +51,7 @@
//= 3.4 Corrected some Issues with the Waiting Room. (bugreport:1890) [Samuray22]
//= -Deleted a Unnecesary Next; on Hunter Guildsman#hnt. (bugreports:1665,2239,2179)
//= 3.5 Added Quest Log commands. [Kisuka]
//= 3.6 Removed the need for use of 'goto.' [L0ne_W0lf]
//============================================================
// Notices in the old Hunter Guild.
@ -196,7 +197,8 @@ hu_in01,386,373,4 script Hunter Guildsman#hnt 727,{
getitem 1710,1; //CrossBow
close;
}
else if (JobLevel > 39 && HNTR_Q == 0) {
else if ((JobLevel > 39) && ((HNTR_Q == 0) || (HNTR_Q == 1))) {
if (HNTR_Q == 0) {
mes "[Hunter Guildsman]";
mes "Oh, you're an Archer! It seems as if you've trained enough as an Archer... You came here to become a Hunter, right?";
next;
@ -231,7 +233,31 @@ hu_in01,386,373,4 script Hunter Guildsman#hnt 727,{
mes "[Hunter Sherin]";
mes "I just want to know how you think about life, and why you want to become a Hunter, so there's no need to be nervous.";
next;
L_AskQuestions:
}
else {
mes "[Hunter Sherin]";
mes "Okay...";
mes "Come back";
mes "when you're ready~";
close;
}
break;
case 2:
set .@selection,2;
break;
case 3:
set .@selection,3;
break;
}
}
else if (HNTR_Q == 1) {
mes "[Hunter Sherin]";
mes "Welcome back...!";
mes "Well, let's start with the interview. This time, carefully think about the answers to each question.";
next;
}
switch(.@selection) {
default:
mes "[Hunter Sherin]";
mes "Well then,";
mes "let's begin.";
@ -379,12 +405,6 @@ L_AskQuestions:
mes "[Hunter Sherin]";
mes "Then, you'll be more in tune with nature and with other people. It's this kind of harmony that makes the best Hunters.";
close;
}
mes "[Hunter Sherin]";
mes "Okay...";
mes "Come back";
mes "when you're ready~";
close;
case 2:
mes "[Hunter Guildsman]";
mes "Job change";
@ -412,13 +432,6 @@ L_AskQuestions:
close;
}
}
else if (JobLevel > 39 && HNTR_Q == 1) {
mes "[Hunter Sherin]";
mes "Welcome back...!";
mes "Well, let's start with the interview. This time, carefully think about the answers to each question.";
next;
goto L_AskQuestions;
}
else if (HNTR_Q > 2 && HNTR_Q < 10) {
mes "[Hunter Sherin]";
mes "Just give the item to the Demon Hunter, the guy who's all the way to the left in this area~";
@ -461,8 +474,28 @@ hu_in01,382,382,4 script Guild Receptionist#hnt 732,{
mes "[Guild Receptionist]";
mes "Greetings. They call me... ^660000The Demon Hunter^000000. I am the one in charge of processing applications. Your name is ... " + strcharinfo(0) + ", correct?";
next;
if (select("Yes, that is correct.:Nope~~(heeheehee)") == 1) {
L_GiveQuestItems:
set .@selection,select("Yes, that is correct.:Nope~~(heeheehee)");
if (.@selection == 2) {
mes "[Demon Hunter]";
mes "Hey, stop messing around.";
mes "Your name is " + strcharinfo(0) + ", right?";
next;
if (select("Yes...:Hehehe. I keep telling you, it's not~~") == 1) {
mes "[Demon Hunter]";
mes "Okay, then. These are the items you need for the test. Since we provide all of the necessary arrows you'll use for the test, we need you to get the materials to make them.";
next;
mes "[Demon Hunter]";
mes "You see, right now we're having some financial problems. Let's see, we're short on these items...";
next;
}
else {
mes "[Demon Hunter]";
mes "Leave if you plan to trifle me your petty tricks. Do you not realize that you are toying with ^660000The Demon Hunter^000000?!'";
close2;
warp "hugel",208,223;
end;
}
}
mes "[Demon Hunter]";
mes "Okay. These are the items you need for the test. Since we provide all the arrows you will be using for this test, we need you to get the materials to make them.";
next;
@ -485,6 +518,7 @@ L_GiveQuestItems:
//Porcupine_Spike, Yoyo_Tailm Acorn
case 7: setarray .@items[0], 1027,2, 942,1, 1026,1, 9; changequest 4001,4008; break;
}
if (.@selection == 1) {
mes "[Demon Hunter]";
mes "Hmm. ^660000"+.@items[1]+" "+getitemname(.@items[0])+"^000000 to use for arrow tips. ^660000"+.@items[3]+" "+getitemname(.@items[2])+"^000000 to use here and there. And ^660000"+.@items[5]+" "+getitemname(.@items[4])+"^000000 please.";
set HNTR_Q,.@items[6];
@ -494,27 +528,9 @@ L_GiveQuestItems:
next;
mes "[Demon Hunter]";
mes "Alright then, come back to me when you have everything ready~";
}
close;
}
mes "[Demon Hunter]";
mes "Hey, stop messing around.";
mes "Your name is " + strcharinfo(0) + ", right?";
next;
if (select("Yes...:Hehehe. I keep telling you, it's not~~") == 1) {
mes "[Demon Hunter]";
mes "Okay, then. These are the items you need for the test. Since we provide all of the necessary arrows you'll use for the test, we need you to get the materials to make them.";
next;
mes "[Demon Hunter]";
mes "You see, right now we're having some financial problems. Let's see, we're short on these items...";
next;
goto L_GiveQuestItems;
}
mes "[Demon Hunter]";
mes "Leave if you plan to trifle me your petty tricks. Do you not realize that you are toying with ^660000The Demon Hunter^000000?!'";
close2;
warp "hugel",208,223;
end;
}
else if (HNTR_Q >= 3 && HNTR_Q <= 9) {
switch(HNTR_Q) {
//Claw_Of_Desert_Wolf, Wooden_Block, White_Herb

243
npc/jobs/2-1/knight.txt
View File

@ -5,7 +5,7 @@
//= Converted by kobra_k88
//= Further bugfixed and tested by Lupus
//===== Current Version: =====================================
//= 2.9
//= 3.0
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@ -36,6 +36,7 @@
//= 2.7a Corrected a Typo error ";;". [Samuray22]
//= 2.8 Now uses enable and disable waitingroomevent. [L0ne_W0lf]
//= 2.9 Added Quest Log commands. [Kisuka]
//= 3.0 Removed the need for use of 'goto.' [L0ne_W0lf]
//============================================================
prt_in,88,101,4 script Chivalry Captain#knt 56,{
@ -909,6 +910,7 @@ prt_in,71,91,0 script Sir Siracuse#knt 65,{
close;
}
else if (KNIGHT_Q == 4 || KNIGHT_Q == 5) {
if (KNIGHT_Q == 4) {
mes "[Sir Siracuse]";
mes "Oh?";
mes "Do you have";
@ -931,7 +933,45 @@ prt_in,71,91,0 script Sir Siracuse#knt 65,{
mes "Please answer";
mes "promptly.";
next;
L_AskQuestions:
}
else {
mes "[Sir Siracuse]";
mes "Hmmm...?";
mes "Alright.";
mes "It's just that";
mes "you had that";
mes "look on your";
mes "face.";
close;
}
}
else if (KNIGHT_Q == 5) {
mes "[Sir Siracuse]";
mes "What...";
mes "You again?";
next;
if (select("I wish to take the test again.:Oh, nothing.") == 1) {
mes "[Sir Siracuse]";
mes "Is that right?";
mes "Are you sure you're";
mes "prepared this time?";
next;
mes "[Sir Siracuse]";
mes "Alright then,";
mes "here we go again...";
next;
}
else {
mes "[Sir Siracuse]";
mes "Hmmm...?";
mes "Alright.";
mes "It's just that";
mes "you had that";
mes "look on your";
mes "face.";
close;
}
}
mes "[Sir Siracuse]";
mes "A Knight must possess great strength, defense, speed, and the skill to wield a Two-Handed Sword. Which of the following weapons are not affected by the Two Hand Quicken skill?";
next;
@ -1084,41 +1124,6 @@ L_AskQuestions:
mes "get to you.";
close;
}
mes "[Sir Siracuse]";
mes "Hmmm...?";
mes "Alright.";
mes "It's just that";
mes "you had that";
mes "look on your";
mes "face.";
close;
}
else if (KNIGHT_Q == 5) {
mes "[Sir Siracuse]";
mes "What...";
mes "You again?";
next;
if (select("I wish to take the test again.:Oh, nothing.") == 1) {
mes "[Sir Siracuse]";
mes "Is that right?";
mes "Are you sure you're";
mes "prepared this time?";
next;
mes "[Sir Siracuse]";
mes "Alright then,";
mes "here we go again...";
next;
goto L_AskQuestions;
}
mes "[Sir Siracuse]";
mes "Hmmm...?";
mes "Alright.";
mes "It's just that";
mes "you had that";
mes "look on your";
mes "face.";
close;
}
else if (KNIGHT_Q == 6) {
mes "[Sir Siracuse]";
mes "Oh?";
@ -1657,7 +1662,8 @@ prt_in,69,107,6 script Lady Amy#knt 728,{
mes "Alright...";
close;
}
else if (KNIGHT_Q) == 8 {
else if ((KNIGHT_Q == 8) || (KNIGHT_Q == 9)){
if (KNIGHT_Q == 8) {
mes "[Lady Amy]";
mes "Hmmm?";
mes "Why did you";
@ -1691,7 +1697,48 @@ prt_in,69,107,6 script Lady Amy#knt 728,{
mes "Then,";
mes "let's begin!";
next;
L_AskQuestions:
}
else {
mes "[Lady Amy]";
mes "Aww...";
mes "Alright~";
close;
}
}
else if (KNIGHT_Q == 9) {
mes "[Lady Amy]";
mes "Hmmm?";
mes "Why did you";
mes "come to Amy?";
next;
if (select("I would like to take the test to change jobs.:Oh, nothing.") == 1) {
mes "[Lady Amy]";
mes "Mmm~?";
mes "Have you learned";
mes "what you did wrong";
mes "last time? If you";
mes "fail again, I'm going";
mes "to be mad!";
next;
mes "[Lady Amy]";
mes "So listen carefully";
mes "and answer as if you";
mes "are a Knight.";
mes "Well then,";
mes "let's begin!";
next;
mes "[Lady Amy]";
mes "You are a Knight and you are looking for a party in Morroc.";
mes "How would you go about doing so?";
next;
}
else {
mes "[Lady Amy]";
mes "Aww...";
mes "Alright~";
close;
}
}
mes "[Lady Amy]";
mes "You are a Knight and you are looking for a party in Morroc.";
mes "How would you go about doing so?";
@ -1856,44 +1903,6 @@ L_AskQuestions:
mes "retake the test, okay?";
close;
}
mes "[Lady Amy]";
mes "Aww...";
mes "Alright~";
close;
}
else if (KNIGHT_Q == 9) {
mes "[Lady Amy]";
mes "Hmmm?";
mes "Why did you";
mes "come to Amy?";
next;
if (select("I would like to take the test to change jobs.:Oh, nothing.") == 1) {
mes "[Lady Amy]";
mes "Mmm~?";
mes "Have you learned";
mes "what you did wrong";
mes "last time? If you";
mes "fail again, I'm going";
mes "to be mad!";
next;
mes "[Lady Amy]";
mes "So listen carefully";
mes "and answer as if you";
mes "are a Knight.";
mes "Well then,";
mes "let's begin!";
next;
mes "[Lady Amy]";
mes "You are a Knight and you are looking for a party in Morroc.";
mes "How would you go about doing so?";
next;
goto L_AskQuestions;
}
mes "[Lady Amy]";
mes "Aww...";
mes "Alright~";
close;
}
else if (KNIGHT_Q == 10) {
mes "[Lady Amy]";
mes "Hmmm?";
@ -2277,7 +2286,8 @@ prt_in,87,92,4 script Sir Gray#knt 119,{
mes "once time has passed.";
close;
}
else if (KNIGHT_Q == 12) {
else if ((KNIGHT_Q == 12) || (KNIGHT_Q == 13)) {
if (KNIGHT_Q == 12) {
mes "[Sir Gray]";
mes "Oh...";
mes "A young Swordman.";
@ -2308,7 +2318,46 @@ prt_in,87,92,4 script Sir Gray#knt 119,{
mes "decide to become";
mes "a Knight?";
next;
L_AskQuestions:
}
else {
mes "[Sir Gray]";
mes "Take care!";
close;
}
}
else if (KNIGHT_Q == 13) {
mes "[Sir Gray]";
mes "Ah, you again.";
mes "What brings you";
mes "to me?";
next;
if (select("I've been thinking a lot.:Oh, nothing.") == 1) {
mes "[Sir Gray]";
mes "Is that so...";
mes "I wonder if you";
mes "truly have...";
next;
mes "[Sir Gray]";
mes "Then...";
mes "Like last time,";
mes "I will ask again...";
next;
mes "[Sir Gray]";
mes "First...";
mes "Why did you";
mes "decide to become";
mes "a Knight?";
next;
}
else {
mes "[Sir Gray]";
mes "Take care!";
mes "Health is";
mes "every man's";
mes "treasure!";
close;
}
}
switch(select("To become stronger...:To help my guild...:Because I'm unsatisfied with myself right now...")) {
case 1:
mes "[Sir Gray]";
@ -2589,42 +2638,6 @@ L_AskQuestions:
close;
}
}
mes "[Sir Gray]";
mes "Take care!";
close;
}
else if (KNIGHT_Q == 13) {
mes "[Sir Gray]";
mes "Ah, you again.";
mes "What brings you";
mes "to me?";
next;
if (select("I've been thinking a lot.:Oh, nothing.") == 1) {
mes "[Sir Gray]";
mes "Is that so...";
mes "I wonder if you";
mes "truly have...";
next;
mes "[Sir Gray]";
mes "Then...";
mes "Like last time,";
mes "I will ask again...";
next;
mes "[Sir Gray]";
mes "First...";
mes "Why did you";
mes "decide to become";
mes "a Knight?";
next;
goto L_AskQuestions;
}
mes "[Sir Gray]";
mes "Take care!";
mes "Health is";
mes "every man's";
mes "treasure!";
close;
}
else if (KNIGHT_Q == 14) {
mes "[Sir Gray]";
mes "I told you";

24
npc/jobs/2-1/priest.txt
View File

@ -5,7 +5,7 @@
//= Converted by: kobra_k88.
//= Further bugfixed and tested by Lupus
//===== Current Version: =====================================
//= 2.5
//= 2.6
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@ -29,6 +29,7 @@
//= 2.4a Deleted unused variables. [Samuray22]
//= 2.4b Corrected a Typo error ";;". [Samuray22]
//= 2.5 Added Quest Log commands. [Kisuka]
//= 2.6 Removed the need for use of 'goto.' [L0ne_W0lf]
//==========================================================
prt_church,16,41,4 script High Bishop#prst 60,{
@ -706,13 +707,21 @@ prt_church,27,24,1 script Sister Cecilia 79,{
mes "May God give you guidance and protection. When you complete your training, please come back to me.";
close;
}
else if (PRIEST_Q == 7) {
else if (PRIEST_Q == 7 || PRIEST_Q == 8) {
if (PRIEST_Q == 7) {
if(checkquest(8014) == -1) {
changequest 8013,8014;
}
mes "Welcome! I'm so glad to see you've come back! Now, there is one last trial left for you to complete.";
}
else if (PRIEST_Q == 8) {
mes "...";
next;
mes "[Sister Cecilia]";
mes "Welcome back.";
mes "I hope that you've reflected on what you've said last time, and that you now have the attitude to become a Priest.";
}
next;
L_AskQuestions:
mes "[Sister Cecilia]";
if (sex)
mes "Brother "+ strcharinfo(0) +"...";
@ -842,15 +851,6 @@ L_AskQuestions:
mes "to throw this all away...?";
close;
}
else if (PRIEST_Q == 8) {
mes "...";
next;
mes "[Sister Cecilia]";
mes "Welcome back.";
mes "I hope that you've reflected on what you've said last time, and that you now have the attitude to become a Priest.";
next;
goto L_AskQuestions;
}
else if (PRIEST_Q == 9) {
mes "Congratulations.";
mes "You've completed all three trials required for the Priesthood. Bishop Paul is now waiting for you.";

63
npc/jobs/2-1/wizard.txt
View File

@ -4,7 +4,7 @@
//= (Aegis) Translated by yoshiki, converted by kobra_k88
//= Further bugfixed and tested by Lupus
//===== Current Version: =====================================
//= 3.0
//= 3.1
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@ -24,6 +24,7 @@
//= 2.9 Reverted the change of donpcevent to doevent. [L0ne_W0lf]
//= Was probably cuased by a warp BEFORE a percentheal
//= 3.0 Added Quest Log commands. [Kisuka]
//= 3.1 Removed the need for use of 'goto.' [L0ne_W0lf]
//============================================================
gef_tower,111,37,4 script Wizard Guildsman 70,{
@ -513,7 +514,8 @@ gef_tower,102,24,2 script Gloomy Wizard 735,{
mes "*Cough* *cough* Let's see how well you live as a Wizard. ~Hahahahhaha";
close;
}
else if (WIZ_Q == 3) {
else if ((WIZ_Q == 3) || (WIZ_Q == 4)) {
if (WIZ_Q == 3) {
mes "[Raulel]";
mes "*Cough* *cough*...You must've passed the first test.";
mes "Ok, I'm the Wizard in charge of your testing from now on. My name is 'Raulel Asparagus'.";
@ -551,7 +553,34 @@ gef_tower,102,24,2 script Gloomy Wizard 735,{
next;
mes "[Raulel]";
mes "*Cough* *cough* Then here go the questions!";
L_AskQuestions:
}
else if (WIZ_Q == 4) {
mes "[Raulel]";
mes "Hahahaha~ Are you that desperate? *sneeze* What a pain in the arse...";
next;
mes "[Raulel]";
mes "Since you don't want to settle for a stable and peaceful life, I'll give you another chance...";
next;
mes "[Raulel]";
mes "If you miss one single question, then just give up. You wouldn't have any talent in being a Wizard! ~Hahahahaha";
next;
if (select("Because of you, I want to live as a normal Mage now.:I would like to continue with the tests.") == 1) {
mes "[Raulel]";
mes "Hahahaha~ Surprising, comming from you, that's a very wise choice...*cough* *cough*";
mes "If i were you, i would never, ever dream of becoming a Wizard again. Gre...Greaa...*sneeze* Greater Magic wasn't meant for humans to use.";
next;
mes "[Raulel]";
mes "Just leave the top of this tower quietly and never look back.";
mes "Live peacefully with the powers that you have right now.";
close;
}
mes "[Raulel]";
mes "Hahahahahahaha~ Now there's a foolish one right here!";
mes "Well then, let's see just how good you can be! *sneeze* I want to see this with my own two eyes.";
next;
mes "[Raulel]";
mes "Then let's begin the test!";
}
next;
switch(rand(1,3)) {
case 1:
@ -792,34 +821,6 @@ L_AskQuestions:
close;
}
}
else if (WIZ_Q == 4) {
mes "[Raulel]";
mes "Hahahaha~ Are you that desperate? *sneeze* What a pain in the arse...";
next;
mes "[Raulel]";
mes "Since you don't want to settle for a stable and peaceful life, I'll give you another chance...";
next;
mes "[Raulel]";
mes "If you miss one single question, then just give up. You wouldn't have any talent in being a Wizard! ~Hahahahaha";
next;
if (select("Because of you, I want to live as a normal Mage now.:I would like to continue with the tests.") == 1) {
mes "[Raulel]";
mes "Hahahaha~ Surprising, comming from you, that's a very wise choice...*cough* *cough*";
mes "If i were you, i would never, ever dream of becoming a Wizard again. Gre...Greaa...*sneeze* Greater Magic wasn't meant for humans to use.";
next;
mes "[Raulel]";
mes "Just leave the top of this tower quietly and never look back.";
mes "Live peacefully with the powers that you have right now.";
close;
}
mes "[Raulel]";
mes "Hahahahahahaha~ Now there's a foolish one right here!";
mes "Well then, let's see just how good you can be! *sneeze* I want to see this with my own two eyes.";
next;
mes "[Raulel]";
mes "Then let's begin the test!";
goto L_AskQuestions;
}
else if (WIZ_Q == 5) {
mes "[Raulel]";
mes "Ok, hope you got plenty of rest. Hahahahahah~";

58
npc/jobs/2-2/alchemist.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= nestor_zulueta (Fusion), converted by Darkchild
//===== Current Version: =====================================
//= 2.9
//= 3.0
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@ -16,6 +16,7 @@
//= 2.7 Added missing checkweights. [L0ne_W0lf]
//= 2.8 Fixed minor typo in test section. [L0ne_W0lf]
//= 2.9 Added Quest Log commands. [Kisuka]
//= 3.0 Removed the need for use of 'goto.' [L0ne_W0lf]
//============================================================
alde_alche,27,185,5 script Alchemist Guildsman#am 744,{
@ -413,7 +414,8 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 749,{
mes "Even if you tried studying for a thousand years, maybe even more, it'd be useless to you! Forget about it and just worry about your store!";
close;
}
else if (ALCH_Q == 4) {
else if ((ALCH_Q == 4) || (ALCH_Q == 5)) {
if (ALCH_Q == 4) {
mes "Heeheehee";
mes "keheheh~!";
mes "What do you";
@ -467,6 +469,7 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 749,{
set ALCH_Q,6;
close;
}
else {
mes "[Raspuchin Gregory]";
mes "Surprised, are you?";
mes "Keheheh~ If you thought";
@ -480,8 +483,32 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 749,{
mes "all these problems.";
mes "Let's see how smart";
mes "really are.";
}
}
else if (ALCH_Q == 5) {
mes "What...?!";
mes "You want to take";
mes "the test again?!";
mes "I thought I told";
mes "you to leave!";
next;
mes "[Raspuchin Gregory]";
mes "I don't like it...";
mes "I don't like this!";
next;
mes "[Raspuchin Gregory]";
mes "Fine...";
mes "I'll try to overlook your pitiful performance last time and give";
mes "you another chance. Don't screw";
mes "up again, got it?";
next;
mes "[Raspuchin Gregory]";
mes "Now then,";
mes "give me all the";
mes "^551A8Bright^000000 answers";
mes "this time.";
}
next;
L_AskQuestions:
switch(rand(1,3)) {
case 1:
mes "[Raspuchin Gregory]";
@ -750,31 +777,6 @@ L_AskQuestions:
changequest 2031,2032;
close;
}
else if (ALCH_Q == 5) {
mes "What...?!";
mes "You want to take";
mes "the test again?!";
mes "I thought I told";
mes "you to leave!";
next;
mes "[Raspuchin Gregory]";
mes "I don't like it...";
mes "I don't like this!";
next;
mes "[Raspuchin Gregory]";
mes "Fine...";
mes "I'll try to overlook your pitiful performance last time and give";
mes "you another chance. Don't screw";
mes "up again, got it?";
next;
mes "[Raspuchin Gregory]";
mes "Now then,";
mes "give me all the";
mes "^551A8Bright^000000 answers";
mes "this time.";
next;
goto L_AskQuestions;
}
else if (ALCH_Q == 6) {
mes "What are you doing?";
mes "Go and find Darwin now.";

135
npc/jobs/2-2/bard.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= Muad_Dib(The Prometheus Project), Lupus, Samuray22
//===== Current Version: =====================================
//= 2.5
//= 2.6
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@ -22,6 +22,7 @@
//= - Changed item names to item IDs
//= 2.4 Fixed hang up on bard quest. ($kiN.) [L0ne_W0lf]
//= 2.5 Added Quest Log commands. [Kisuka]
//= 2.6 Removed the need for use of 'goto.' [L0ne_W0lf]
//============================================================
//=============== Ayealo ============================
@ -421,7 +422,8 @@ comodo,226,123,5 script Wandering Bard 741,{
cutin "job_bard_aiolo01",255;
end;
}
else if(BARD_Q == 3) {
else if ((BARD_Q >= 3) || (BARD_Q <= 5)) {
if (BARD_Q == 3) {
if(xmas_npc > 10) { //this var is set in LUTIE.TXT
cutin "job_bard_aiolo01",2;
mes "[Lalo]";
@ -441,7 +443,39 @@ comodo,226,123,5 script Wandering Bard 741,{
mes "Ehem *clears throat*";
mes "1, 2, 3, 4";
next;
B_Sing:
}
else {
cutin "job_bard_aiolo01",2;
set xmas_npc,1;
mes "[Lalo]";
mes "Eh, you still haven't become his friend?";
mes "Talking will not be enough.";
next;
mes "[Lalo]";
mes "if you become friends with ^008800Jack Frost^000000, you will receive something.";
mes "And talk with the village people, too...";
close2;
cutin "job_bard_aiolo01",255;
end;
}
}
else if (BARD_Q == 4) {
cutin "job_bard_aiolo01",2;
mes "[Lalo]";
mes "Hmm... this time you can do better, right?";
mes "Let's try again, you can do it.";
next;
mes "[Lalo]";
mes "I'll sing one part...";
mes "and you try it after.";
next;
mes "[Lalo]";
mes "Here we go.";
mes "*Ehem*";
mes "1, 2, 3, 4";
next;
}
if (BARD_Q != 5) {
set .@bard_s, rand(1,5);
if (.@bard_s == 1) {
mes "^3377FFThere was a man^000000";
@ -808,8 +842,9 @@ B_Sing:
mes "Do you want to just change jobs now?";
mes "Or do you want a present.";
next;
if (select("Just change my job please.:I'd be thankful for a present.") == 1) {
B_Change:
set .@selection,select("Just change my job please.:I'd be thankful for a present.");
}
if ((.@selection == 1) || (BARD_Q == 5)) {
if(SkillPoint) {
cutin "job_bard_aiolo01",2;
mes "[Lalo]";
@ -824,6 +859,24 @@ B_Change:
cutin "job_bard_aiolo01",255;
end;
}
else {
switch(BARD_Q) {
case 5:
if(countitem(1019) > 59) callsub S_ChangeJob,1019,1901;
else if(countitem(1068) > 59) callsub S_ChangeJob,1068,1903;
else if(countitem(1067) > 59) callsub S_ChangeJob,1067,1903;
else if(countitem(1066) > 59) {
if(JobLevel > 49) callsub S_ChangeJob,1066,1910;
else callsub S_ChangeJob,1066,1905;
}
cutin "job_bard_aiolo01",2;
mes "[Lalo]";
mes "Mmm? Seems like you haven't prepared all trunks the yet? ";
mes "Do you want to just change jobs anyways?";
next;
if (select("Yes, just change my job already.:No, I'll go prepare them.") == 2)
break;
default:
completequest 3003;
callfunc "Job_Change",Job_Bard;
callfunc "F_ClearJobVar"; //clears all job variables for the current player
@ -837,6 +890,8 @@ B_Change:
cutin "job_bard_aiolo01",255;
end;
}
}
}
changequest 3003,3004;
mes "[Lalo]";
mes "Hmm... very well, bring some trunks.";
@ -850,76 +905,6 @@ B_Change:
end;
}
cutin "job_bard_aiolo01",2;
set xmas_npc,1;
mes "[Lalo]";
mes "Eh, you still haven't become his friend?";
mes "Talking will not be enough.";
next;
mes "[Lalo]";
mes "if you become friends with ^008800Jack Frost^000000, you will receive something.";
mes "And talk with the village people, too...";
close2;
cutin "job_bard_aiolo01",255;
end;
}
else if(BARD_Q == 4) {
cutin "job_bard_aiolo01",2;
mes "[Lalo]";
mes "Hmm... this time you can do better, right?";
mes "Let's try again, you can do it.";
next;
mes "[Lalo]";
mes "I'll sing one part...";
mes "and you try it after.";
next;
mes "[Lalo]";
mes "Here we go.";
mes "*Ehem*";
mes "1, 2, 3, 4";
next;
goto B_SING;
}
else if(BARD_Q == 5) {
if(SkillPoint) {
cutin "job_bard_aiolo01",2;
mes "[Lalo]";
mes "Ah... Everything is good, but you still have some skill points left.";
mes "Go learn the rest of the skills and come back.";
next;
mes "[Lalo]";
mes "And I am going to give you a small present...";
mes "So don't forget the trunks.";
mes "It doesn't matter what kind, as long as they are 60 of the same sort...";
close2;
cutin "job_bard_aiolo01",255;
end;
}
if(countitem(1019) > 59) callsub S_ChangeJob,1019,1901;
else if(countitem(1068) > 59) callsub S_ChangeJob,1068,1903;
else if(countitem(1067) > 59) callsub S_ChangeJob,1067,1903;
else if(countitem(1066) > 59) {
if(JobLevel > 49) callsub S_ChangeJob,1066,1910;
else callsub S_ChangeJob,1066,1905;
}
cutin "job_bard_aiolo01",2;
mes "[Lalo]";
mes "Mmm? Seems like you haven't prepared all trunks the yet? ";
mes "Do you want to just change jobs anyways?";
next;
if (select("Yes, just change my job already.:No, I'll go prepare them.") == 1) goto B_Change;
cutin "job_bard_aiolo01",2;
mes "[Lalo]";
mes "Hmm... ok, bring some ^3355FFtrunks^000000.";
mes "Doesn't matter what kind, as long as they are 60 of the same sort.";
next;
mes "[Lalo]";
mes "I'll give you a present if you bring them.";
mes "Then see you soon.";
close2;
cutin "job_bard_aiolo01",255;
end;
}
cutin "job_bard_aiolo01",2;
mes "[Lalo]";
mes "Whee~ whee~ whee~";
close2;

9
npc/jobs/2-2/crusader.txt
View File

@ -4,7 +4,7 @@
//= Made by: Black Dragon
//= Converted by: Shin
//===== Current Version: =====================================
//= 3.2
//= 3.3
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@ -31,6 +31,7 @@
//= 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]
//= 3.3 Removed the need for use of 'goto.' [L0ne_W0lf]
//============================================================
@ -491,7 +492,8 @@ prt_church,95,127,3 script Crusader 745,{
mes "If you would like to become a Crusader, please speak with our leader in the Prontera Central Palace.";
close;
}
else if(CRUS_Q == 6) {
else if((CRUS_Q == 6) || (CRUS_Q == 7)) {
if(CRUS_Q == 6) {
mes "Welcome.";
mes "Did you do well";
mes "on those painful tests?";
@ -509,7 +511,6 @@ prt_church,95,127,3 script Crusader 745,{
mes "you 10 questions.";
mes "Answer them correctly.";
next;
goto C_Questions;
}
else if(CRUS_Q == 7) {
mes "Welcome back~";
@ -524,7 +525,7 @@ prt_church,95,127,3 script Crusader 745,{
mes "Listen carefully, and";
mes "choose the correct answer.";
next;
C_Questions:
}
set .@cru_m,rand(1,3);
if (.@cru_m == 1) {
mes "[Gabriel Valentine]";

143
npc/jobs/2-2/monk.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= Dino9021, Edited / Translated by Celest
//===== Current Version: =====================================
//= 2.4
//= 2.5
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@ -15,6 +15,7 @@
//= 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]
//= 2.5 Removed the need for use of 'goto.' [L0ne_W0lf]
//============================================================
prt_monk,59,247,1 script Guarding Monk#mk 120,6,2,{
@ -903,6 +904,7 @@ monk_in,99,58,1 script Sensei Moohae#mk 60,{
}
prt_monk,251,255,1 script Touha#mk 79,{
if (MONK_Q >= 10 && MONK_Q < 14) {
if (MONK_Q == 10) {
mes "[Touha]";
mes "What brings you to me.";
@ -935,10 +937,16 @@ prt_monk,251,255,1 script Touha#mk 79,{
mes "[Touha]";
mes "Please repeat after me.";
next;
mes "[Touha]";
changequest 3024,3025;
switch(rand(1,3)) {
case 1:
}
else {
mes "[Touha]";
mes "Now, pay attention this time...";
next;
}
mes "[Touha]";
set .@rand,rand(1,3);
if ((.@rand == 1) || (MONK_Q == 11)) {
set MONK_Q,11;
mes "I seek the path";
next;
@ -968,8 +976,8 @@ prt_monk,251,255,1 script Touha#mk 79,{
next;
mes "[Touha]";
mes "et Spiritus Sancti.";
break;
case 2:
}
else if ((.@rand == 2) || (MONK_Q == 12)) {
set MONK_Q,12;
mes "I commit myself to";
next;
@ -999,8 +1007,8 @@ prt_monk,251,255,1 script Touha#mk 79,{
next;
mes "[Touha]";
mes "et Spiritus Sancti.";
break;
case 3:
}
else if ((.@rand == 3) || (MONK_Q == 13)) {
set MONK_Q,13;
mes "And shepherds we shall be,";
next;
@ -1032,12 +1040,13 @@ prt_monk,251,255,1 script Touha#mk 79,{
mes "et Spiritus Sancti.";
}
next;
if (MONK_Q == 10) {
mes "[Touha]";
mes "Ok, that is all. Now repeat what I have spoken.";
if (MONK_Q == 11) {
L_MonkOath1:
mes "" + strcharinfo(0) + ", your turn.";
next;
}
if (MONK_Q == 11) {
switch(select("shall hold true:We monks:and will help protect others:through the teachings:In nomine Patris, et Filii:to what we believe:I seek the path:we learn through our lives.:et Spiritus Sancti.:of enlightenment.")) {
case 1:
mes "[" + strcharinfo(0) + "]";
@ -1219,9 +1228,6 @@ L_MonkOath1:
}
}
else if (MONK_Q == 12) {
L_MonkOath2:
mes "" + strcharinfo(0) + ", your turn.";
next;
switch(select("I will follow my path:veritas and aequitas.:to enlightenment and purity.:I commit myself to:I will protect my:victorious while I breathe.:brothers with my life.:Evil shall never be:In nomine Patris, et Filii:et Spiritus Sancti.")) {
case 1:
mes "[" + strcharinfo(0) + "]";
@ -1402,9 +1408,6 @@ L_MonkOath2:
}
}
else if (MONK_Q == 13) {
L_MonkOath3:
mes "" + strcharinfo(0) + ", your turn.";
next;
switch(select("for thee my lord for thee.:And shepherds we shall be,:Power hath descended forth:out thy command. And we shall:from the hand:flow a river forth to thee and:so our feet may swiftly carry:teeming with souls shall it ever be:et Spiritus Sancti.:In nomine Patris, et Filii")) {
case 1:
mes "[" + strcharinfo(0) + "]";
@ -1637,114 +1640,6 @@ L_MonkOath3:
close;
}
}
else if (MONK_Q > 10 && MONK_Q < 14) {
mes "[Touha]";
mes "Now, pay attention this time...";
next;
mes "[Touha]";
if (MONK_Q == 11) {
mes "I seek the path";
next;
mes "[Touha]";
mes "of enlightenment.";
next;
mes "[Touha]";
mes "We monks";
next;
mes "[Touha]";
mes "shall hold true";
next;
mes "[Touha]";
mes "to what we believe";
next;
mes "[Touha]";
mes "and will help protect others";
next;
mes "[Touha]";
mes "through the teachings";
next;
mes "[Touha]";
mes "we learn through our lives.";
next;
mes "[Touha]";
mes "In nomine Patris, et Filii";
next;
mes "[Touha]";
mes "et Spiritus Sancti.";
next;
mes "[Touha]";
mes "Ok, that is the end.";
goto L_MonkOath1;
}
else if (MONK_Q == 12) {
mes "I commit myself to";
next;
mes "[Touha]";
mes "veritas and aequitas.";
next;
mes "[Touha]";
mes "I will follow my path";
next;
mes "[Touha]";
mes "to enlightenment and purity.";
next;
mes "[Touha]";
mes "I will protect my";
next;
mes "[Touha]";
mes "brothers with my life.";
next;
mes "[Touha]";
mes "Evil shall never be";
next;
mes "[Touha]";
mes "victorious while I breathe.";
next;
mes "[Touha]";
mes "In nomine Patris, et Filii";
next;
mes "[Touha]";
mes "et Spiritus Sancti.";
next;
mes "[Touha]";
mes "That's it... were you paying attention?.";
goto L_MonkOath2;
}
else if (MONK_Q == 13) {
mes "And shepherds we shall be,";
next;
mes "[Touha]";
mes "for thee my lord for thee.";
next;
mes "[Touha]";
mes "Power hath descended forth";
next;
mes "[Touha]";
mes "from the hand";
next;
mes "[Touha]";
mes "so our feet may swiftly carry";
next;
mes "[Touha]";
mes "out thy command. And we shall";
next;
mes "[Touha]";
mes "flow a river forth to thee and";
next;
mes "[Touha]";
mes "teeming with souls shall it ever be";
next;
mes "[Touha]";
mes "In nomine Patris, et Filii";
next;
mes "[Touha]";
mes "et Spiritus Sancti.";
next;
mes "[Touha]";
mes "I hope you were paying attention this time. This is a sacred family prayer.";
goto L_MonkOath3;
}
}
else if (MONK_Q == 14) {
mes "[Touha]";
mes "Hmm... did you forget who to visit?";

3
npc/jobs/2-2/sage.txt
View File

@ -5,7 +5,7 @@
//= Unknown Translator (1.0)
//= Darkchild (1.2)
//===== Current Version: =====================================
//= 2.7
//= 2.8
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@ -26,6 +26,7 @@
//= 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]
//= 2.8 Removed the need for use of 'goto.' [L0ne_W0lf]
//============================================================
yuno_in02,38,61,5 script Dean of the Academy#sa 743,{