From 13132344467b3f5e2c968bb7cfaec8eaf269280e Mon Sep 17 00:00:00 2001 From: masao87 Date: Tue, 29 May 2012 12:08:59 +0000 Subject: - Added BaseClass explanation to script_commands.txt . - Some updates to the custom folder / the old eAAC Scripts which are now in there. - Fixed custom/warper.txt prontera location to not collide with Ash Vacuum warper. bugreport:5857 - Fixed Platinum Skill Quests properly checking for BaseClass now. bugreport:5853 - Fixed some typos in Ranger Job change Quest & Eden Paradise. bugreport:5858 - Fixed a typo in scripts_athena.conf . bugreport:5852 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16165 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/quests/skills/acolyte_skills.txt | 2 +- npc/quests/skills/archer_skills.txt | 8 ++++---- npc/quests/skills/mage_skills.txt | 2 +- npc/quests/skills/merchant_skills.txt | 8 ++++---- npc/quests/skills/swordman_skills.txt | 10 +++++----- npc/quests/skills/thief_skills.txt | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) (limited to 'npc/quests') diff --git a/npc/quests/skills/acolyte_skills.txt b/npc/quests/skills/acolyte_skills.txt index 4662d2728..c6dd68f4e 100644 --- a/npc/quests/skills/acolyte_skills.txt +++ b/npc/quests/skills/acolyte_skills.txt @@ -67,7 +67,7 @@ prt_church,173,23,4 script Cleric 79,{ mes "this skill for the work of good . ."; close; } - if ((countitem(727) > 0) && (countitem(991) > 0) && (countitem(2608) > 0) && (JobLevel > 29) && (BaseJob == Job_Acolyte)) { + if ((countitem(727) > 0) && (countitem(991) > 0) && (countitem(2608) > 0) && (JobLevel > 29) && (BaseClass == Job_Acolyte)) { mes "[Acolyte Klift]"; mes "Your faith has proven worthy"; mes "for you to gain the ' Holy Light ' skill."; diff --git a/npc/quests/skills/archer_skills.txt b/npc/quests/skills/archer_skills.txt index bc1fdf670..dd1233e56 100644 --- a/npc/quests/skills/archer_skills.txt +++ b/npc/quests/skills/archer_skills.txt @@ -15,7 +15,7 @@ //============================================================ moc_ruins,118,99,5 script Roberto 88,{ - if (BaseJob == Job_Archer) { + if (BaseClass == Job_Archer) { if (getskilllv("AC_MAKINGARROW") == 1) { mes "[Roberto]"; mes "Ooh, you're from my home town!"; @@ -33,13 +33,13 @@ moc_ruins,118,99,5 script Roberto 88,{ mes "Then byebye~"; close; } - else if ((BaseJob == Job_Archer) && (JobLevel >= 30)) { + else if ((BaseClass == Job_Archer) && (JobLevel >= 30)) { mes "[Roberto]"; mes "Eh!"; mes " "; mes "You are..."; next; - if ((countitem(907) > 19) && (countitem(921) > 6) && (countitem(906) > 40) && (countitem(1019) > 12) && (countitem(501) > 0) && (BaseJob == Job_Archer) && (JobLevel >= 30)) { + if ((countitem(907) > 19) && (countitem(921) > 6) && (countitem(906) > 40) && (countitem(1019) > 12) && (countitem(501) > 0) && (BaseClass == Job_Archer) && (JobLevel >= 30)) { mes "[Roberto]"; mes "You brought them!"; mes "Thank you very much."; @@ -147,7 +147,7 @@ moc_ruins,118,99,5 script Roberto 88,{ } payon,103,63,3 script Jason 88,3,3,{ - if (BaseJob == Job_Archer) { + if (BaseClass == Job_Archer) { if (getskilllv("AC_CHARGEARROW") == 1) { mes "[Jason]"; mes "Eh, we meet again."; diff --git a/npc/quests/skills/mage_skills.txt b/npc/quests/skills/mage_skills.txt index 6ed54c254..cb141443d 100644 --- a/npc/quests/skills/mage_skills.txt +++ b/npc/quests/skills/mage_skills.txt @@ -92,7 +92,7 @@ geffen_in,151,119,4 script Great Wizard 64,{ mes "I have nothing more to teach you ..."; close; } - if ((countitem(746) > 2) && (countitem(730) > 0) && (countitem(935) > 4) && (countitem(943) > 0) && (JobLevel > 34) && (BaseJob == Job_Mage)) { + if ((countitem(746) > 2) && (countitem(730) > 0) && (countitem(935) > 4) && (countitem(943) > 0) && (JobLevel > 34) && (BaseClass == Job_Mage)) { mes "[BLIZZARDRISS]"; mes "Okay, I have received your request."; mes "I will now awaken your hidden energies . ."; diff --git a/npc/quests/skills/merchant_skills.txt b/npc/quests/skills/merchant_skills.txt index e85d19aed..1fb202072 100644 --- a/npc/quests/skills/merchant_skills.txt +++ b/npc/quests/skills/merchant_skills.txt @@ -15,7 +15,7 @@ //============================================================ alberta,83,96,5 script Necko 98,7,7,{ - if (BaseJob == Job_Merchant) { + if (BaseClass == Job_Merchant) { if (getskilllv("MC_LOUD") == 1) { mes "[Necko]"; mes "I'm sorry. Necko's store is..."; @@ -179,7 +179,7 @@ OnTouch: } alberta,119,221,6 script Charlron 107,{ - if (BaseJob == Job_Merchant) { + if (BaseClass == Job_Merchant) { if (getskilllv("MC_CHANGECART") == 1) { mes "[Charlron]"; mes "Mmm? I was wondering who was making all"; @@ -332,7 +332,7 @@ alberta,119,221,6 script Charlron 107,{ } alberta,232,103,6 script Gershaun 57,{ - if (BaseJob == Job_Merchant) { + if (BaseClass == Job_Merchant) { if (getskilllv("MC_CARTREVOLUTION") == 1) { mes "[Gershaun]"; mes "Ah, long time no see!"; @@ -347,7 +347,7 @@ alberta,232,103,6 script Gershaun 57,{ mes "Here! Hurry!"; close; } - else if ((BaseJob == Job_Merchant) && (JobLevel >= 35)) { + else if ((BaseClass == Job_Merchant) && (JobLevel >= 35)) { mes "[Gershaun]"; mes "Ooh. You have a firm body"; mes "for a merchant. You must be"; diff --git a/npc/quests/skills/swordman_skills.txt b/npc/quests/skills/swordman_skills.txt index 2c991d792..31853bc8c 100644 --- a/npc/quests/skills/swordman_skills.txt +++ b/npc/quests/skills/swordman_skills.txt @@ -15,7 +15,7 @@ //============================================================ izlude_in,175,130,2 script Knight De Thomas 98,4,4,{ - if ((BaseJob == Job_Swordman) && (sm_movingrecovery_x < 1)) { + if ((BaseClass == Job_Swordman) && (sm_movingrecovery_x < 1)) { mes "[De Thomas]"; mes "Oh, no! You must have been hurt! Are you ok?"; mes "You must have fought hard to get such serious injuries.."; @@ -74,7 +74,7 @@ izlude_in,175,130,2 script Knight De Thomas 98,4,4,{ close; } } - else if ((BaseJob == Job_Swordman) && (sm_movingrecovery_x > 1)) { + else if ((BaseClass == Job_Swordman) && (sm_movingrecovery_x > 1)) { mes "[De Thomas]"; mes "Oh, it's you?"; mes "Long time no see!"; @@ -83,7 +83,7 @@ izlude_in,175,130,2 script Knight De Thomas 98,4,4,{ mes "Take care! See you again!"; close; } - else if ((BaseJob == Job_Swordman) && (sm_movingrecovery_x == 1)) { + else if ((BaseClass == Job_Swordman) && (sm_movingrecovery_x == 1)) { mes "[De Thomas]"; mes "Welcome back..."; mes "are you ready to learn Body Movin'?"; @@ -150,7 +150,7 @@ izlude_in,175,130,2 script Knight De Thomas 98,4,4,{ prt_in,75,88,5 script Leon Von Frich 85,3,3,{ - if ((BaseJob == Job_Swordman) && (JobLevel >= 25)) { + if ((BaseClass == Job_Swordman) && (JobLevel >= 25)) { if (getskilllv("SM_FATALBLOW") == 1) { mes "[Leon]"; mes "Eh?"; @@ -303,7 +303,7 @@ OnTouch: } prt_in,94,57,3 script Juan 85,4,4,{ - if (BaseJob == Job_Swordman) { + if (BaseClass == Job_Swordman) { if (getskilllv("SM_AUTOBERSERK") == 1) { mes "[Juan]"; mes "Mmm? Long time no see!"; diff --git a/npc/quests/skills/thief_skills.txt b/npc/quests/skills/thief_skills.txt index 81004cce9..2de3e01ae 100644 --- a/npc/quests/skills/thief_skills.txt +++ b/npc/quests/skills/thief_skills.txt @@ -16,7 +16,7 @@ //============================================================ moc_prydb1,154,128,4 script Alcouskou 118,{ - if (BaseJob == Job_Thief) { + if (BaseClass == Job_Thief) { mes "[Alcouskou]"; mes "As you live life you will encounter"; mes "many things. Sometimes you will"; -- cgit v1.2.3-70-g09d2