summaryrefslogtreecommitdiff
path: root/npc/re
diff options
context:
space:
mode:
authormasao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-07-28 17:22:58 +0000
committermasao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-07-28 17:22:58 +0000
commitbac34367a987e5eeb0b263b7dafe36282fdd7a51 (patch)
tree15cbb4422ce3e764a66236f014423e4237bbc1e5 /npc/re
parent693467a92ac8dd1c2c0cc1962e0de54ae94c92ea (diff)
downloadhercules-bac34367a987e5eeb0b263b7dafe36282fdd7a51.tar.gz
hercules-bac34367a987e5eeb0b263b7dafe36282fdd7a51.tar.bz2
hercules-bac34367a987e5eeb0b263b7dafe36282fdd7a51.tar.xz
hercules-bac34367a987e5eeb0b263b7dafe36282fdd7a51.zip
- Follow up r16521
* Forgot to apply some changes from my Test folder to the rAthena folder. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16522 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/re')
-rw-r--r--npc/re/jobs/1-1/acolyte.txt56
-rw-r--r--npc/re/jobs/1-1/merchant.txt10
-rw-r--r--npc/re/jobs/1-1/thief.txt14
3 files changed, 40 insertions, 40 deletions
diff --git a/npc/re/jobs/1-1/acolyte.txt b/npc/re/jobs/1-1/acolyte.txt
index 147496143..a21d4846c 100644
--- a/npc/re/jobs/1-1/acolyte.txt
+++ b/npc/re/jobs/1-1/acolyte.txt
@@ -96,7 +96,7 @@ prt_church,184,41,4 script Cleric#aco 60,{
} else {
jobchange Job_Acolyte;
}
- set job_acolyte_q,0;
+ set ACO_Q,0;
getitem 1545,1; //N_Mace
mes "[Father Mareusis]";
mes "Always remember to be thankful to God, who is taking care of us all the time.";
@@ -126,7 +126,7 @@ prt_church,184,41,4 script Cleric#aco 60,{
prt_fild03,365,255,2 script Ascetic#aco 89,{
if (Class == Job_Novice) {
- if (job_acolyte_q == 6) {
+ if (ACO_Q== 6) {
mes "[Father Rubalkabara]";
mes "Please take care. They should know that you've met me by the time you arrive at the Prontera Sanctuary.";
next;
@@ -134,8 +134,8 @@ prt_fild03,365,255,2 script Ascetic#aco 89,{
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) {
+ if (ACO_Q!= 0) {
+ if (ACO_Q== 2) {
mes "[Father Rubalkabara]";
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;
@@ -157,7 +157,7 @@ prt_fild03,365,255,2 script Ascetic#aco 89,{
mes "[Father Rubalkabara]";
mes "Farewell.";
savepoint "prt_fild03",361,255;
- set job_acolyte_q,6;
+ set ACO_Q,6;
close;
}
mes "[Father Rubalkabara]";
@@ -180,8 +180,8 @@ prt_fild03,365,255,2 script Ascetic#aco 89,{
close;
}
if (Class == Job_Baby_Acolyte || Class == Job_Acolyte) {
- if (job_priest_q != 0) {
- if (job_priest_q == 1) {
+ if (PRST_Q != 0) {
+ if (PRST_Q == 1) {
mes "[Father Rubalkabara]";
mes "Ah yes, so you're the young Acolyte who wishes to become a Priest.";
next;
@@ -194,10 +194,10 @@ prt_fild03,365,255,2 script Ascetic#aco 89,{
mes "[Father Rubalkabara]";
mes "Well then, please head to your next destination for your pilgrimage. Be safe in your travels.";
savepoint "prt_fild03",361,255;
- set job_priest_q,2;
+ set PRST_Q,2;
close;
}
- if (job_priest_q == 2) {
+ if (PRST_Q == 2) {
mes "[Father Rubalkabara]";
mes "Please be hurry to the next destination for your pilgrimage. I hope you become a Priest soon.";
close;
@@ -229,7 +229,7 @@ prt_fild03,365,255,2 script Ascetic#aco 89,{
moc_fild07,41,355,4 script Ascetic#2 95,{
if (Class == Job_Novice) {
- if (job_acolyte_q == 6) {
+ if (ACO_Q== 6) {
mes "[Mother Marthilda]";
mes "I will send a carrier pigeon to the Prontera Sanctuary. When you return, the Priest there should already have received my message.";
next;
@@ -237,8 +237,8 @@ moc_fild07,41,355,4 script Ascetic#2 95,{
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) {
+ if (ACO_Q!= 0) {
+ if (ACO_Q== 3) {
mes "[Mother Marthilda]";
mes "Ah, you must be one of the Acolyte applicants. I sincerely welcome you.";
next;
@@ -251,7 +251,7 @@ moc_fild07,41,355,4 script Ascetic#2 95,{
mes "[Mother Marthilda]";
mes "Please return to the Prontera Sanctuary and speak to the Priest in charge.";
savepoint "moc_fild07",35,355;
- set job_acolyte_q,7;
+ set ACO_Q,7;
close;
}
mes "[Mother Marthilda]";
@@ -278,8 +278,8 @@ moc_fild07,41,355,4 script Ascetic#2 95,{
close;
}
if (Class == Job_Baby_Acolyte || Class == Job_Acolyte) {
- if (job_priest_q != 0) {
- if (job_priest_q == 1) {
+ if (PRST_Q != 0) {
+ if (PRST_Q == 1) {
mes "[Mother Marthilda]";
mes "Hmm...";
mes "It seems you're";
@@ -293,7 +293,7 @@ moc_fild07,41,355,4 script Ascetic#2 95,{
mes "Perhaps you should ask Bishop Paul or Sister Cecilia once again. Well, may God be with you...";
close;
}
- if (job_priest_q == 2) {
+ if (PRST_Q == 2) {
mes "[Mother Marthilda]";
mes "Ah, are you";
mes "a Priest trainee...?";
@@ -312,10 +312,10 @@ moc_fild07,41,355,4 script Ascetic#2 95,{
mes "God for safety";
mes "on your journey.";
savepoint "moc_fild07",35,355;
- set job_priest_q,3;
+ set PRST_Q,3;
close;
}
- if (job_priest_q == 3) {
+ if (PRST_Q == 3) {
mes "[Mother Marthilda]";
mes "Please leave soon, and";
mes "continue your training.";
@@ -346,7 +346,7 @@ moc_fild07,41,355,4 script Ascetic#2 95,{
prt_fild00,208,218,6 script Ascetic#3 98,{
if (Class == Job_Novice) {
- if (job_acolyte_q == 8) {
+ if (ACO_Q== 8) {
mes "[Father Yosuke]";
mes "What?";
next;
@@ -354,8 +354,8 @@ prt_fild00,208,218,6 script Ascetic#3 98,{
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) {
+ if (ACO_Q!= 0) {
+ if (ACO_Q== 4) {
mes "[Father Yosuke]";
mes "Hey.";
mes "Whatever you are,";
@@ -376,7 +376,7 @@ prt_fild00,208,218,6 script Ascetic#3 98,{
mes "[Father Yosuke]";
mes "Now go back to the Santuary and finish becoming an Acolyte, kid.";
savepoint "prt_fild00",206,230;
- set job_acolyte_q,8;
+ set ACO_Q,8;
close;
}
mes "[Father Yosuke]";
@@ -401,8 +401,8 @@ prt_fild00,208,218,6 script Ascetic#3 98,{
close;
}
if (Class == Job_Baby_Acolyte || Class == Job_Acolyte) {
- if (job_priest_q != 0) {
- if (job_priest_q == 1) {
+ if (PRST_Q != 0) {
+ if (PRST_Q == 1) {
mes "[Father Yosuke]";
mes "Hmm...";
mes "A Priest trainee, eh?";
@@ -415,7 +415,7 @@ prt_fild00,208,218,6 script Ascetic#3 98,{
mes "Now, go back to Church, kid.";
close;
}
- if (job_priest_q == 2) {
+ if (PRST_Q == 2) {
mes "[Father Yosuke]";
mes "Hmm...";
mes "A Priest trainee, eh?";
@@ -427,7 +427,7 @@ prt_fild00,208,218,6 script Ascetic#3 98,{
mes "But that's your own fault. Go back to Church.";
close;
}
- if (job_priest_q == 3) {
+ if (PRST_Q == 3) {
mes "[Father Yosuke]";
mes "Hmm.";
mes "A Priest";
@@ -446,10 +446,10 @@ prt_fild00,208,218,6 script Ascetic#3 98,{
mes "your trials is now";
mes "completed.";
savepoint "prt_fild00",206,230;
- set job_priest_q,4;
+ set PRST_Q,4;
close;
}
- if (job_priest_q == 4) {
+ if (PRST_Q == 4) {
mes "[Father Yosuke]";
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...?";
diff --git a/npc/re/jobs/1-1/merchant.txt b/npc/re/jobs/1-1/merchant.txt
index 6c9004a76..3f023de28 100644
--- a/npc/re/jobs/1-1/merchant.txt
+++ b/npc/re/jobs/1-1/merchant.txt
@@ -85,8 +85,8 @@ alberta_in,53,43,6 script Merchant#mer 86,{
} else {
jobchange Job_Merchant;
}
- set job_merchant_q,0;
- set job_merchant_q2,0;
+ set MERCNT_Q,0;
+ set MERCNT_Q2,0;
getitem 1381,1; //N_Battle_Axe
mes "[Guildsman Mahnsoo]";
mes "Congratulations again for being a member of the merchant guild and one of our colleagues. I expect your active participation from now on!";
@@ -169,7 +169,7 @@ alberta_in,53,43,6 script Merchant#mer 86,{
}
alberta_in,28,29,2 script Merchant Guildsman 83,{
- if (job_merchant_q == 0 || job_merchant_q == 1 || job_merchant_q == 2) {
+ if (MERCNT_Q == 0 || MERCNT_Q == 1 || MERCNT_Q == 2) {
mes "[Union Staff Kay]";
mes "I am sorry, but we don't make deliveries anymore.";
mes "Didn't Chief Mahnsoo tell you?";
@@ -186,7 +186,7 @@ alberta_in,28,29,2 script Merchant Guildsman 83,{
}
morocc_in,140,102,4 script Student#mer 86,{
- if (job_merchant_q == 4 || job_merchant_q == 3) {
+ if (MERCNT_Q == 4 || MERCNT_Q == 3) {
mes "[Dyer's Student]";
mes "I am sorry, but the Merchant Guild no longer makes deliveries to us anymore.";
close;
@@ -203,7 +203,7 @@ morocc_in,140,102,4 script Student#mer 86,{
}
geffen_in,155,122,4 script Guild Staff 47,{
- if (job_merchant_q == 4 || job_merchant_q == 3) {
+ if (MERCNT_Q == 4 || MERCNT_Q == 3) {
mes "[Guild Staff]";
mes "I am sorry, but the Merchant Guild no longer makes deliveries to us anymore.";
close;
diff --git a/npc/re/jobs/1-1/thief.txt b/npc/re/jobs/1-1/thief.txt
index 5c72e51cc..d2a1cf07d 100644
--- a/npc/re/jobs/1-1/thief.txt
+++ b/npc/re/jobs/1-1/thief.txt
@@ -143,7 +143,7 @@ moc_prydb1,39,129,2 script Thief Guildsman 69,{
next;
switch (select("I want to be a Thief.:Nothing.")) {
case 1:
- if (job_thief_q == 0) {
+ if (THF_Q == 0) {
mes "[Thief Guildsman]";
mes "Well, are you that proud of it? You're telling me so proudly that you want to be a Thief! Why don't you go to all the villages and advertise yourself for being a thief?";
mes "'Ha ha ha! Go put up a banner that says 'I will be a proud thief who steals other people's stuff.'";
@@ -191,7 +191,7 @@ moc_prydb1,39,129,2 script Thief Guildsman 69,{
mes "[Thief Guildsman]";
mes "Alright. I looked at your Felony Record, and you seem to have a very interesting history. You might have what it takes to be a Thief.";
mes "" + strcharinfo(0) + ". I now decree that you have passed this interview. Good work!";
- set job_thief_q,1;
+ set THF_Q,1;
next;
mes "[Thief Guildsman]";
mes "Well, I'm not in charge of making you a Thief. I just accept applications, get it?";
@@ -203,7 +203,7 @@ moc_prydb1,39,129,2 script Thief Guildsman 69,{
close;
}
}
- if (job_thief_q == 1) {
+ if (THF_Q == 1) {
mes "[Thief Guildsman]";
mes "Well, I'm not in charge of making you a Thief. I just accept applications, get it?";
mes " If you want to become a Thief, ask the sharp-eyed guy next to me.";
@@ -244,12 +244,12 @@ moc_prydb1,42,133,2 script Comrade 118,{
mes "you doing here anyway?";
close;
}
- if (job_thief_q == 0) {
+ if (THF_Q == 0) {
mes "[Comrade]";
mes "What's the matter? If you want to be a Thief, speak to the woman beside me.";
close;
}
- if (job_thief_q == 1) {
+ if (THF_Q == 1) {
mes "[Thief Guildsman]";
mes "Alright. You must have passed the job interview, huh?";
mes "Good. I'll accept you.";
@@ -318,7 +318,7 @@ moc_ruins,141,125,3 script Mr. Irrelevant 83,{
close;
}
}
- if (job_thief_q == 1) {
+ if (THF_Q == 1) {
mes "[Mr. Irrelevant]";
mes "There is this strange smell coming from... You. Now why would that be?";
close;
@@ -329,4 +329,4 @@ moc_ruins,141,125,3 script Mr. Irrelevant 83,{
mes "[Mr. Irrelevant]";
mes "You can get more information in the Underground Room in the Pyramid 1 BF.";
close;
-}
+} \ No newline at end of file