From 8c748978945b24f2b508d54c6068c7ee69a862ad Mon Sep 17 00:00:00 2001 From: masao87 Date: Sun, 5 Aug 2012 11:19:56 +0000 Subject: - Some little adjustments to the job change quests, also reverted some variables to the old job change files. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16582 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/pre-re/jobs/1-1/acolyte.txt | 56 ++++++++++++++++++++-------------------- npc/pre-re/jobs/1-1/archer.txt | 4 +-- npc/pre-re/jobs/1-1/mage.txt | 2 +- npc/pre-re/jobs/1-1/merchant.txt | 6 ++--- npc/pre-re/jobs/1-1/swordman.txt | 7 +++-- npc/pre-re/jobs/1-1/thief.txt | 2 +- 6 files changed, 38 insertions(+), 39 deletions(-) (limited to 'npc/pre-re') diff --git a/npc/pre-re/jobs/1-1/acolyte.txt b/npc/pre-re/jobs/1-1/acolyte.txt index 0c8307cbb..20c1f50f3 100644 --- a/npc/pre-re/jobs/1-1/acolyte.txt +++ b/npc/pre-re/jobs/1-1/acolyte.txt @@ -15,7 +15,7 @@ //============================================================ prt_church,184,41,4 script Cleric#aco 60,{ if (Upper == 1) { - if (FJOB == Job_Arch_Bishop || FJOB == Job_Sura) { + if (ADVJOB == Job_High_Priest || ADVJOB == Job_Champion) { if (Class == Job_Novice_High) { mes "[Father Mareusis]"; mes "Ah, I sense you have endured"; @@ -125,8 +125,8 @@ prt_church,184,41,4 script Cleric#aco 60,{ } prt_fild03,365,255,2 script Ascetic#aco 89,{ - if (Class == Job_Novice) { - if (ACO_Q== 6) { + if (Class == Job_Baby || Class == Job_Novice) { + 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 (ACO_Q!= 0) { - if (ACO_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; @@ -180,8 +180,8 @@ prt_fild03,365,255,2 script Ascetic#aco 89,{ close; } if (Class == Job_Baby_Acolyte || Class == Job_Acolyte) { - if (PRST_Q != 0) { - if (PRST_Q == 1) { + if (ACO_Q2 != 0) { + if (ACO_Q2 == 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 PRST_Q,2; + set ACO_Q2,2; close; } - if (PRST_Q == 2) { + if (ACO_Q2 == 2) { mes "[Father Rubalkabara]"; mes "Please be hurry to the next destination for your pilgrimage. I hope you become a Priest soon."; close; @@ -228,8 +228,8 @@ prt_fild03,365,255,2 script Ascetic#aco 89,{ } moc_fild07,41,355,4 script Ascetic#2 95,{ - if (Class == Job_Novice) { - if (ACO_Q== 6) { + if (Class == Job_Baby || Class == Job_Novice) { + 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 (ACO_Q!= 0) { - if (ACO_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; @@ -278,8 +278,8 @@ moc_fild07,41,355,4 script Ascetic#2 95,{ close; } if (Class == Job_Baby_Acolyte || Class == Job_Acolyte) { - if (PRST_Q != 0) { - if (PRST_Q == 1) { + if (ACO_Q2 != 0) { + if (ACO_Q2 == 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 (PRST_Q == 2) { + if (ACO_Q2 == 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 PRST_Q,3; + set ACO_Q2,3; close; } - if (PRST_Q == 3) { + if (ACO_Q2 == 3) { mes "[Mother Marthilda]"; mes "Please leave soon, and"; mes "continue your training."; @@ -345,8 +345,8 @@ moc_fild07,41,355,4 script Ascetic#2 95,{ } prt_fild00,208,218,6 script Ascetic#3 98,{ - if (Class == Job_Novice) { - if (ACO_Q== 8) { + if (Class == Job_Baby || Class == Job_Novice) { + 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 (ACO_Q!= 0) { - if (ACO_Q== 4) { + if (ACO_Q != 0) { + if (ACO_Q == 4) { mes "[Father Yosuke]"; mes "Hey."; mes "Whatever you are,"; @@ -401,8 +401,8 @@ prt_fild00,208,218,6 script Ascetic#3 98,{ close; } if (Class == Job_Baby_Acolyte || Class == Job_Acolyte) { - if (PRST_Q != 0) { - if (PRST_Q == 1) { + if (ACO_Q2 != 0) { + if (ACO_Q2 == 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 (PRST_Q == 2) { + if (ACO_Q2 == 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 (PRST_Q == 3) { + if (ACO_Q2 == 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 PRST_Q,4; + set ACO_Q2,4; close; } - if (PRST_Q == 4) { + if (ACO_Q2 == 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/pre-re/jobs/1-1/archer.txt b/npc/pre-re/jobs/1-1/archer.txt index c51a080bd..985b6c0f8 100644 --- a/npc/pre-re/jobs/1-1/archer.txt +++ b/npc/pre-re/jobs/1-1/archer.txt @@ -14,7 +14,7 @@ //============================================================ payon_in02,64,71,4 script Archer Guildsman 85,{ if (Upper == 1) { - if ((Class == Job_Novice_High) && (FJOB == Job_Ranger || FJOB == Job_Minstrel || FJOB == Job_Wanderer)) { + if ((Class == Job_Novice_High) && (ADVJOB == Job_Sniper || ADVJOB == Job_Clown || ADVJOB == Job_Gypsy)) { mes "[Archer Guildsman]"; mes "Hey, I know you."; next; @@ -76,7 +76,7 @@ payon_in02,64,71,4 script Archer Guildsman 85,{ mes "extremely high concentration,"; mes "so we do not accept "; mes "those who have little patience."; - close2; + close; } mes "[Archer Guildsman]"; mes "You seem to have learned the basic skills.."; diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt index 03b850049..51d4dbe27 100644 --- a/npc/pre-re/jobs/1-1/mage.txt +++ b/npc/pre-re/jobs/1-1/mage.txt @@ -14,7 +14,7 @@ //============================================================ geffen_in,164,124,4 script Mage Guildsman 123,{ if (Upper == 1) { - if (FJOB == Job_Warlock || FJOB == Job_Sorcerer) { + if ((Class == Job_Novice_High) && (ADVJOB == Job_High_Wizard || ADVJOB == Job_Professor)) { if (Class == Job_Novice_High) { mes "[Mage Guildsman]"; mes "Whoa, long time no see! But weren't you supposed to be dead?"; diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt index 5b0b3557c..c9ad936fd 100644 --- a/npc/pre-re/jobs/1-1/merchant.txt +++ b/npc/pre-re/jobs/1-1/merchant.txt @@ -14,7 +14,7 @@ //============================================================ alberta_in,53,43,6 script Merchant#mer 86,{ if (Upper == 1) { - if ((Class == Job_Novice_High) && (FJOB == Job_Mechanic || FJOB == Job_Genetic)) { + if ((Class == Job_Novice_High) && (ADVJOB == Job_Whitesmith || ADVJOB == Job_Creator)) { mes "[Chief Mahnsoo]"; mes "Long time no see!"; mes "Hey, you didn't quit"; @@ -70,7 +70,7 @@ alberta_in,53,43,6 script Merchant#mer 86,{ next; mes "[Guildsman Mahnsoo]"; mes "Don't you think we need to learn some basic skills although we just deal with money?"; - close2; + close; } mes "[Guildsman Mahnsoo]"; mes "Good, I think you're fully ready for it seeing that your basic skill level is fulfilled."; @@ -169,7 +169,7 @@ alberta_in,53,43,6 script Merchant#mer 86,{ } alberta_in,28,29,2 script Merchant Guildsman 83,{ - if (MERCNT_Q == 0 || MERCNT_Q == 1 || MERCNT_Q == 2) { + if ((MERCNT_Q >= 0) && (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?"; diff --git a/npc/pre-re/jobs/1-1/swordman.txt b/npc/pre-re/jobs/1-1/swordman.txt index 61ecdc253..15521250d 100644 --- a/npc/pre-re/jobs/1-1/swordman.txt +++ b/npc/pre-re/jobs/1-1/swordman.txt @@ -14,7 +14,7 @@ //============================================================ izlude_in,74,172,4 script Swordman 119,{ if (Upper == 1) { - if ((Class == Job_Novice_High) && (FJOB == Job_Rune_Knight || FJOB == Job_Royal_Guard)) { + if ((Class == Job_Novice_High) && (ADVJOB == Job_Lord_Knight || ADVJOB == Job_Paladin)) { mes "[Swordman Guildsman]"; mes "It..."; mes "Can't be..."; @@ -85,7 +85,7 @@ izlude_in,74,172,4 script Swordman 119,{ if (Class == Job_Baby || Class == Job_Novice) { if (getskilllv("NV_BASIC") < 9) { mes "[Swordman Guildsman]"; - mes "I'm sorry to tell you this but to be a Swordman, you must reach at least ^4d4dffJob Level 10^000000."; + mes "I'm sorry to tell you this but to be a Swordman, you must reach at least ^4d4dffJOB Level 10^000000."; mes "and ^4d4dffBasic Skill Level 9^000000."; next; mes "[Swordman Guildsman]"; @@ -109,7 +109,6 @@ izlude_in,74,172,4 script Swordman 119,{ } else { jobchange Job_Swordman; } - set job_sword_q,0; getitem 13415,1; //N_Falchion mes "[Swordman Guildsman]"; mes "Congratulations again for becomming a Swordman and I hope that you participate in many activities for the revival of our guild."; @@ -121,7 +120,7 @@ izlude_in,74,172,4 script Swordman 119,{ close; } } - if (Class == Job_Baby_Swordman || Class == Job_Swordman || Class == Job_Swordman) { + if (Class == Job_Baby_Swordman || Class == Job_Swordman) { mes "[Swordman Guildsman]"; mes "You are already an excellent Swordman, aren't you?"; mes "Just devote yourself to be a great Swordman."; diff --git a/npc/pre-re/jobs/1-1/thief.txt b/npc/pre-re/jobs/1-1/thief.txt index 956b5c277..8f90b16d4 100644 --- a/npc/pre-re/jobs/1-1/thief.txt +++ b/npc/pre-re/jobs/1-1/thief.txt @@ -14,7 +14,7 @@ //============================================================ moc_prydb1,39,129,2 script Thief Guildsman 69,{ if (Upper == 1) { - if (FJOB == Job_Guillotine_Cross || FJOB == Job_Shadow_Chaser) { + if ((Class == Job_Novice_High) && (ADVJOB == Job_Assassin_Cross || ADVJOB == Job_Stalker)) { if (Class == Job_Novice_High) { mes "[Thief Guildsman]"; mes "Huh? Do I know you? It's creepy that you seem so familiar. You don't have a twin, do you?"; -- cgit v1.2.3-60-g2f50