diff options
| author | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-08-12 22:24:30 +0000 |
|---|---|---|
| committer | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-08-12 22:24:30 +0000 |
| commit | 76df6d56c2bce7aec016ee07a9092f72a5cdb989 (patch) | |
| tree | 1eaa543cc7e13e45bf9e75cc848a5dddc3d1f3a5 /npc/jobs | |
| parent | 436a6910525b26aa26c56b40199f582589cec53c (diff) | |
| download | hercules-76df6d56c2bce7aec016ee07a9092f72a5cdb989.tar.gz hercules-76df6d56c2bce7aec016ee07a9092f72a5cdb989.tar.bz2 hercules-76df6d56c2bce7aec016ee07a9092f72a5cdb989.tar.xz hercules-76df6d56c2bce7aec016ee07a9092f72a5cdb989.zip | |
* Merchant job quest bug fixes. Thanks to Barron-Monster.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10989 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/jobs')
| -rw-r--r-- | npc/jobs/1-1/merchant.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/npc/jobs/1-1/merchant.txt b/npc/jobs/1-1/merchant.txt index 2020f1313..a5b256159 100644 --- a/npc/jobs/1-1/merchant.txt +++ b/npc/jobs/1-1/merchant.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== -//= 1.8 +//= 1.9 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -21,6 +21,7 @@ //= 1.7 Updated to use Free Ticket for Kafra [Lupus] //= 1.8 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] //= No longer uses function "F_ToHigh" +//= 1.9 Bugfixes, thanks to Barron-Monster. [L0ne_W0lf] //============================================================ alberta_in,53,43,6 script Merchant#mer 86,{ @@ -202,6 +203,7 @@ alberta_in,53,43,6 script Merchant#mer 86,{ next; mes "[Chief Mahnsoo]"; mes "You'll have to find Java Dullihan, the Dyemaker, so that you can deliver the product he ordered."; + next; if (job_merchant_q2 == 5) { mes "[Chief Mahnsoo]"; mes "But he's a little forgetful, so give it to one of his students. Remember, the package's Serial Number is ^3355FF3012685^000000."; @@ -503,6 +505,7 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 83,{ else if (job_merchant_q == 8 || job_merchant_q == 7) { mes "[Union Staff Kay]"; mes "Alright! Everything looks perfect! I'll report your success to the guildmaster. Now go talk to Chief Mahnsoo, yeah?"; + close; } else if (job_merchant_q == 6 || job_merchant_q == 5) { mes " [Union Staff Kay] "; @@ -1060,7 +1063,7 @@ function script F_MercKafra { mes "the Merchant Guild?"; mes "Oh, yes, please set"; mes "it down right over there..."; - if (countitem(1081) == 1 || v[Merchant_Box_2] == 1 || countitem(1091) == 1) { + if (countitem(1081) == 1 || countitem(1082) == 1 || countitem(1091) == 1) { mes "You must be really tired"; mes "after carrying it for so long!"; } |