From fb10d4b4a1cf11daf0be70c2c03ca12358b22fbe Mon Sep 17 00:00:00 2001 From: masao87 Date: Thu, 31 May 2012 22:13:00 +0000 Subject: - Fixed parenthesis check in most 3rd job change quests. bugreport:5883 - Partially rewrote Rune Knight job change quest. bugreport:5881 - Follow up r16180 where i forgot to rename some Warper NPC from Mina to Warp Agent. - Fixed some comodo quest typos. bugreport:5882 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16192 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/jobs/3-2/genetic.txt | 2 +- npc/jobs/3-2/sorcerer.txt | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'npc/jobs/3-2') diff --git a/npc/jobs/3-2/genetic.txt b/npc/jobs/3-2/genetic.txt index ff8503e1b..435f6fa15 100644 --- a/npc/jobs/3-2/genetic.txt +++ b/npc/jobs/3-2/genetic.txt @@ -548,7 +548,7 @@ job3_gen01,25,58,3 script Devries#gen 865,{ mes "Bubbles!"; mes "Good news!"; next; - if (Class == Job_Alchemist || Class == Job_Creator || Job_Baby_Alchemist && ((JobLevel > 49) && (SkillPoint == 0) && (BaseLevel > 98))){ + if ((Class == Job_Alchemist || Class == Job_Creator || Job_Baby_Alchemist) && ((JobLevel > 49) && (SkillPoint == 0) && (BaseLevel > 98))){ if (checkcart() == 0){ mes "[Devries]"; mes "Put that heavy and dirty cart away. On such a happy moment, that thing will just ruin it."; diff --git a/npc/jobs/3-2/sorcerer.txt b/npc/jobs/3-2/sorcerer.txt index a2355a5c9..9f6626f4a 100644 --- a/npc/jobs/3-2/sorcerer.txt +++ b/npc/jobs/3-2/sorcerer.txt @@ -35,7 +35,7 @@ gef_tower,102,34,5 script Merito 742,{ mes "Wow~ you are a young adventurer. I envy you."; close; } - if (Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage && (job_soc < 1)){ + if ((Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage) && (job_soc < 1)){ mes "[Merito]"; mes "Welcome. What can I help you with?"; next; @@ -82,7 +82,7 @@ gef_tower,102,34,5 script Merito 742,{ set job_soc,1; close; } - if (Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage && (job_soc == 1)){ + if ((Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage) && (job_soc == 1)){ mes "[Merito]"; mes "Good, then I'll give you a short explanation about the Sorcerer."; next; @@ -140,7 +140,7 @@ gef_tower,102,34,5 script Merito 742,{ close; } } - if (Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage && (job_soc > 1)){ + if ((Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage) && (job_soc > 1)){ mes "[Merito]"; mes "How about your test? Well, Karacas is a little lazy, so that might bother you some... kkk"; close; @@ -168,12 +168,12 @@ gef_tower,113,161,5 script Karacas 754,{ mes "Is there anything I can do for you?"; close; } - if (Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage && (job_soc < 2)){ + if ((Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage) && (job_soc < 2)){ mes "[Karacas]"; mes "More people are visiting Geffen Tower thesedays."; close; } - if (Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage && (job_soc == 2)){ + if ((Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage) && (job_soc == 2)){ mes "[Karacas]"; mes "...."; next; @@ -259,7 +259,7 @@ gef_tower,113,161,5 script Karacas 754,{ changequest 12096,12097; close; } - if (Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage && (job_soc == 3)){ + if ((Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage) && (job_soc == 3)){ if ((countitem(992) > 2) && (countitem(991) > 2) && (countitem(990) > 2) && (countitem(993) > 2)){ mes "[Karacas]"; mes "Oh, you have all the materials."; @@ -349,7 +349,7 @@ gef_tower,113,161,5 script Karacas 754,{ mes "When you bring these basic things, I'll guide you to the next step."; close; } - if (Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage && (job_soc == 4)){ + if ((Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage) && (job_soc == 4)){ if ((countitem(6276) > 0) && (countitem(6278) > 0) && (countitem(6277) > 0)){ mes "[Karacas]"; mes "Wow~ your skill is good."; @@ -372,7 +372,7 @@ gef_tower,113,161,5 script Karacas 754,{ mes "Don't give up and keep on trying~"; close; } - if (Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage && (job_soc == 5)){ + if ((Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage) && (job_soc == 5)){ mes "[Karacas]"; mes "Originally my teacher needs to check the Sorcerer job change but after he went out to find the spirit of fish, I can't see him. So I'll check it myself."; next; -- cgit v1.2.3-70-g09d2