diff options
| author | euphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-07-30 23:59:10 +0000 |
|---|---|---|
| committer | euphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-07-30 23:59:10 +0000 |
| commit | 1ce8bd7486059d05b3953d2412dc060f316a9e06 (patch) | |
| tree | f370ab734779560f1388b4918ce439bc1d06c08b /npc/pre-re/quests/skills/merchant_skills.txt | |
| parent | dc97ceb8baf6c646f16c5bed0064e5d136c1d768 (diff) | |
| download | hercules-1ce8bd7486059d05b3953d2412dc060f316a9e06.tar.gz hercules-1ce8bd7486059d05b3953d2412dc060f316a9e06.tar.bz2 hercules-1ce8bd7486059d05b3953d2412dc060f316a9e06.tar.xz hercules-1ce8bd7486059d05b3953d2412dc060f316a9e06.zip | |
* Fixed job level issues on remaining first class Platinum Skill quests, incl. bugreport:6374 (quests\skills\)
* Some optimization of Ranger job quest (re\jobs\3-1\ranger.txt)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16538 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/pre-re/quests/skills/merchant_skills.txt')
| -rw-r--r-- | npc/pre-re/quests/skills/merchant_skills.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/npc/pre-re/quests/skills/merchant_skills.txt b/npc/pre-re/quests/skills/merchant_skills.txt index 1fb202072..def5ec6aa 100644 --- a/npc/pre-re/quests/skills/merchant_skills.txt +++ b/npc/pre-re/quests/skills/merchant_skills.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.6 +//= 1.7 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -12,6 +12,7 @@ //===== Additional Comments: ================================= //= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] //= 1.6 Updated to latest available official file. [Masao] +//= 1.7 Fixed JobLevel requirements. [Euphy] //============================================================ alberta,83,96,5 script Necko 98,7,7,{ @@ -61,7 +62,7 @@ alberta,83,96,5 script Necko 98,7,7,{ mes "Kyukwakakakakakakakakakaka!"; close; } - else if ((countitem(722) > 6) && (countitem(532) > 0) && (countitem(921) > 49) && (JobLevel >= 15)) { + else if ((countitem(722) > 6) && (countitem(532) > 0) && (countitem(921) > 49) && (JobLevel >= 15 || (BaseJob == Job_Blacksmith || BaseJob == Job_Alchemist))) { mes "[Necko]"; mes "Oh! You!"; mes "You are qualified to learn how to shout!"; @@ -200,7 +201,7 @@ alberta,119,221,6 script Charlron 107,{ mes "Be healthy~"; close; } - else if (JobLevel >= 30) { + else if (JobLevel >= 30|| (BaseJob == Job_Blacksmith || BaseJob == Job_Alchemist)) { mes "[Charlron]"; mes "Nice to see you fellow merchant"; mes "If I remember correctly,"; @@ -347,7 +348,7 @@ alberta,232,103,6 script Gershaun 57,{ mes "Here! Hurry!"; close; } - else if ((BaseClass == Job_Merchant) && (JobLevel >= 35)) { + else if (JobLevel >= 35 || (BaseJob == Job_Blacksmith || BaseJob == Job_Alchemist)) { mes "[Gershaun]"; mes "Ooh. You have a firm body"; mes "for a merchant. You must be"; |