Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a potential dead end in the merchant quest (#5378)

Browse Source
This commit is contained in:
Daegaladh 2020-09-09 16:19:31 +02:00 committed by GitHub
parent 4e5dec29e3
commit ead8bd2272
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
npc/pre-re/jobs/1-1/merchant.txt
View File

@ -180,7 +180,7 @@ alberta_in,53,43,6 script Merchant#mer 86,{
mes "But we all know that~"; mes "But we all know that~";
close; 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]"; mes "[Chief Mahnsoo]";
if (job_merchant_q2 == 1 || job_merchant_q2 == 2) { 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."; 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!"; mes "Take care!";
close; close;
} }
else if (job_merchant_q == 0) { else {
mes "[Chief Mahnsoo]"; mes "[Chief Mahnsoo]";
mes "So, what brings you to"; mes "So, what brings you to";
mes "the Merchant Association?"; mes "the Merchant Association?";