From ead8bd2272cf342d488e0bf09f6cc2cd00066f62 Mon Sep 17 00:00:00 2001 From: Daegaladh Date: Wed, 9 Sep 2020 16:19:31 +0200 Subject: [PATCH] Fixed a potential dead end in the merchant quest (#5378) --- npc/pre-re/jobs/1-1/merchant.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt index ac3bafe640..32ce0b5b7a 100644 --- a/npc/pre-re/jobs/1-1/merchant.txt +++ b/npc/pre-re/jobs/1-1/merchant.txt @@ -180,7 +180,7 @@ alberta_in,53,43,6 script Merchant#mer 86,{ mes "But we all know that~"; close; } - else if (job_merchant_q <= 6 && job_merchant_q != 0) { + else if (job_merchant_q2 && job_merchant_q > 0 && job_merchant_q < 7) { mes "[Chief Mahnsoo]"; if (job_merchant_q2 == 1 || job_merchant_q2 == 2) { mes "First, get the delivery package from the storehouse, and then take it to the former Swordman's Association in Prontera."; @@ -266,7 +266,7 @@ alberta_in,53,43,6 script Merchant#mer 86,{ mes "Take care!"; close; } - else if (job_merchant_q == 0) { + else { mes "[Chief Mahnsoo]"; mes "So, what brings you to"; mes "the Merchant Association?";