diff options
author | masao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-29 12:08:59 +0000 |
---|---|---|
committer | masao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-29 12:08:59 +0000 |
commit | 13132344467b3f5e2c968bb7cfaec8eaf269280e (patch) | |
tree | f178af553d5c2048fe2aa5febf97870f68501923 /npc/quests/skills/merchant_skills.txt | |
parent | 72cd35c33dee93b88969b579a0cc3327b2e7f2d6 (diff) | |
download | hercules-13132344467b3f5e2c968bb7cfaec8eaf269280e.tar.gz hercules-13132344467b3f5e2c968bb7cfaec8eaf269280e.tar.bz2 hercules-13132344467b3f5e2c968bb7cfaec8eaf269280e.tar.xz hercules-13132344467b3f5e2c968bb7cfaec8eaf269280e.zip |
- 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
Diffstat (limited to 'npc/quests/skills/merchant_skills.txt')
-rw-r--r-- | npc/quests/skills/merchant_skills.txt | 8 |
1 files changed, 4 insertions, 4 deletions
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"; |